From c61fbfd6ea0e2b91a0321b6b6cd382f710d0deef Mon Sep 17 00:00:00 2001 From: Erik Gahlin Date: Fri, 10 Jan 2025 13:51:45 +0000 Subject: [PATCH] 8345337: JFR: jfr view should display all direct subfields for an event type Reviewed-by: mgronlun Backport-of: 672c413c61d9b155020a0fd4bd1c2bc0661a60fb --- .../share/classes/jdk/jfr/internal/query/FieldBuilder.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/query/FieldBuilder.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/query/FieldBuilder.java index c6916bc52ef..391db7cc930 100644 --- a/src/jdk.jfr/share/classes/jdk/jfr/internal/query/FieldBuilder.java +++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/query/FieldBuilder.java @@ -353,9 +353,10 @@ final class FieldBuilder { var subFields = we.field().getFields().reversed(); if (!subFields.isEmpty() && !KNOWN_TYPES.contains(we.field().getTypeName())) { for (ValueDescriptor subField : subFields) { - String n = we.name + "." + subField.getName(); - String l = we.label + " : " + makeLabel(subField, false); - if (stack.size() < 2) { // Limit depth to 2 + // Limit depth to 2 + if (!we.name.contains(".")) { + String n = we.name + "." + subField.getName(); + String l = we.label + " : " + makeLabel(subField, false); stack.push(new WildcardElement(n, l, subField)); } }