diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/Utils.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/Utils.java index 2f122fba426..4f6af1ea5ed 100644 --- a/src/jdk.jfr/share/classes/jdk/jfr/internal/Utils.java +++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/Utils.java @@ -582,42 +582,42 @@ public final class Utils { return eventName; } - public static void verifyMirror(Class mirror, Class real) { - Class cMirror = Objects.requireNonNull(mirror); - Class cReal = Objects.requireNonNull(real); - - while (cReal != null) { - Map mirrorFields = new HashMap<>(); - if (cMirror != null) { - for (Field f : cMirror.getDeclaredFields()) { - if (isSupportedType(f.getType())) { - mirrorFields.put(f.getName(), f); - } - } - } - for (Field realField : cReal.getDeclaredFields()) { - if (isSupportedType(realField.getType())) { - String fieldName = realField.getName(); - Field mirrorField = mirrorFields.get(fieldName); - if (mirrorField == null) { - throw new InternalError("Missing mirror field for " + cReal.getName() + "#" + fieldName); - } - if (realField.getModifiers() != mirrorField.getModifiers()) { - throw new InternalError("Incorrect modifier for mirror field "+ cMirror.getName() + "#" + fieldName); - } - mirrorFields.remove(fieldName); - } - } - if (!mirrorFields.isEmpty()) { - throw new InternalError( - "Found additional fields in mirror class " + cMirror.getName() + " " + mirrorFields.keySet()); - } - if (cMirror != null) { - cMirror = cMirror.getSuperclass(); - } - cReal = cReal.getSuperclass(); - } - } + public static void verifyMirror(Class mirror, Class real) { + Class cMirror = Objects.requireNonNull(mirror); + Class cReal = Objects.requireNonNull(real); + + Map mirrorFields = new HashMap<>(); + while (cMirror != null) { + for (Field f : cMirror.getDeclaredFields()) { + if (isSupportedType(f.getType())) { + mirrorFields.put(f.getName(), f); + } + } + cMirror = cMirror.getSuperclass(); + } + while (cReal != null) { + for (Field realField : cReal.getDeclaredFields()) { + if (isSupportedType(realField.getType())) { + String fieldName = realField.getName(); + Field mirrorField = mirrorFields.get(fieldName); + if (mirrorField == null) { + throw new InternalError("Missing mirror field for " + cReal.getName() + "#" + fieldName); + } + if (realField.getModifiers() != mirrorField.getModifiers()) { + throw new InternalError( + "Incorrect modifier for mirror field " + fieldName); + } + mirrorFields.remove(fieldName); + } + } + cReal = cReal.getSuperclass(); + } + + if (!mirrorFields.isEmpty()) { + throw new InternalError( + "Found additional fields in mirror class " + mirrorFields.keySet()); + } + } private static boolean isSupportedType(Class type) { if (Modifier.isTransient(type.getModifiers()) || Modifier.isStatic(type.getModifiers())) {