Skip to content

Commit 97a7f2c

Browse files
committed
8335: Duplicate values in tooltip for RSS and RSS (Peak) in memory tab
1 parent 3922e8a commit 97a7f2c

File tree

1 file changed

+5
-2
lines changed
  • application/org.openjdk.jmc.flightrecorder.ui/src/main/java/org/openjdk/jmc/flightrecorder/ui/pages

1 file changed

+5
-2
lines changed

application/org.openjdk.jmc.flightrecorder.ui/src/main/java/org/openjdk/jmc/flightrecorder/ui/pages/HeapPage.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,9 +215,12 @@ protected IXDataRenderer getChartRenderer(IItemCollection itemsInTable, Histogra
215215
XYDataRenderer heapRenderer = new XYDataRenderer(UnitLookup.MEMORY.getDefaultUnit().quantity(0),
216216
Messages.HeapPage_ROW_MEMORY_USAGE, Messages.HeapPage_ROW_MEMORY_USAGE_DESC);
217217

218+
Optional<IItemCollection> optionalHeapSummaryItems = getMemoryEvents(allItems, HEAP_SUMMARY, heapRenderer);
219+
Optional<IItemCollection> optionalRssItems = getRssEvents(allItems, heapRenderer);
220+
Optional<IItemCollection> optionalOsMemorySummaryItems = getMemoryEvents(allItems, OS_MEMORY_SUMMARY,
221+
heapRenderer);
218222
Supplier<Stream<IItemCollection>> memoryEventsSupplier = () -> Stream
219-
.of(getMemoryEvents(allItems, HEAP_SUMMARY, heapRenderer), getRssEvents(allItems, heapRenderer),
220-
getMemoryEvents(allItems, OS_MEMORY_SUMMARY, heapRenderer))
223+
.of(optionalHeapSummaryItems, optionalRssItems, optionalOsMemorySummaryItems)
221224
.filter(Optional::isPresent).map(Optional::get);
222225

223226
IItemCollection mergedEvents = ItemCollectionToolkit.merge(memoryEventsSupplier);

0 commit comments

Comments
 (0)