8273960: Redundant condition in Metadata.TypeComparator.compare

turbanoff · egahlin · commit 9bc865d38c7e · 2021-09-25T11:42:03.000Z
Reviewed-by: egahlin
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/Metadata.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/Metadata.java
@@ -69,7 +69,7 @@ public int compare(Type t1, Type t2) {
                 } else {
                     // Ensure that jdk.* are printed first
                     // This makes it easier to find user defined events at the end.
-                    if (Type.SUPER_TYPE_EVENT.equals(t1.getSuperType()) && !package1.equals(package2)) {
+                    if (Type.SUPER_TYPE_EVENT.equals(t1.getSuperType())) {
                         if (package1.equals("jdk.jfr")) {
                             return -1;
                         }

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ public int compare(Type t1, Type t2) {`
`69`	`69`	`} else {`
`70`	`70`	`// Ensure that jdk.* are printed first`
`71`	`71`	`// This makes it easier to find user defined events at the end.`
`72`		`- if (Type.SUPER_TYPE_EVENT.equals(t1.getSuperType()) && !package1.equals(package2)) {`
	`72`	`+ if (Type.SUPER_TYPE_EVENT.equals(t1.getSuperType())) {`
`73`	`73`	`if (package1.equals("jdk.jfr")) {`
`74`	`74`	`return -1;`
`75`	`75`	`}`