From 97a7f2ce82b358c30b9700d4df92bb79325d92b3 Mon Sep 17 00:00:00 2001 From: Aymane Harmaz Date: Wed, 12 Nov 2025 10:16:35 +0100 Subject: [PATCH] 8335: Duplicate values in tooltip for RSS and RSS (Peak) in memory tab --- .../org/openjdk/jmc/flightrecorder/ui/pages/HeapPage.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/application/org.openjdk.jmc.flightrecorder.ui/src/main/java/org/openjdk/jmc/flightrecorder/ui/pages/HeapPage.java b/application/org.openjdk.jmc.flightrecorder.ui/src/main/java/org/openjdk/jmc/flightrecorder/ui/pages/HeapPage.java index 318080aeb..c9a41c230 100644 --- a/application/org.openjdk.jmc.flightrecorder.ui/src/main/java/org/openjdk/jmc/flightrecorder/ui/pages/HeapPage.java +++ b/application/org.openjdk.jmc.flightrecorder.ui/src/main/java/org/openjdk/jmc/flightrecorder/ui/pages/HeapPage.java @@ -215,9 +215,12 @@ protected IXDataRenderer getChartRenderer(IItemCollection itemsInTable, Histogra XYDataRenderer heapRenderer = new XYDataRenderer(UnitLookup.MEMORY.getDefaultUnit().quantity(0), Messages.HeapPage_ROW_MEMORY_USAGE, Messages.HeapPage_ROW_MEMORY_USAGE_DESC); + Optional optionalHeapSummaryItems = getMemoryEvents(allItems, HEAP_SUMMARY, heapRenderer); + Optional optionalRssItems = getRssEvents(allItems, heapRenderer); + Optional optionalOsMemorySummaryItems = getMemoryEvents(allItems, OS_MEMORY_SUMMARY, + heapRenderer); Supplier> memoryEventsSupplier = () -> Stream - .of(getMemoryEvents(allItems, HEAP_SUMMARY, heapRenderer), getRssEvents(allItems, heapRenderer), - getMemoryEvents(allItems, OS_MEMORY_SUMMARY, heapRenderer)) + .of(optionalHeapSummaryItems, optionalRssItems, optionalOsMemorySummaryItems) .filter(Optional::isPresent).map(Optional::get); IItemCollection mergedEvents = ItemCollectionToolkit.merge(memoryEventsSupplier);