Merge pull request #290 from Ladicek/fix-class-topological-order

Fix class ordering when propagating type annotations
smallrye · Dec 2, 2022 · 886c2a1 · 886c2a1
2 parents 2edfb82 + 751d90e
commit 886c2a1
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/core/src/main/java/org/jboss/jandex/Indexer.java b/core/src/main/java/org/jboss/jandex/Indexer.java
@@ -2448,14 +2448,18 @@ private boolean isEnclosedIn(ClassInfo c1, ClassInfo c2) {
 
             @Override
             public int compare(ClassInfo c1, ClassInfo c2) {
-                if (isEnclosedIn(c1, c2)) {
+                if (c1.name().equals(c2.name())) {
+                    return 0;
+                } else if (isEnclosedIn(c1, c2)) {
                     // c1 is enclosed in c2, so c2 must be processed sooner
                     return 1;
                 } else if (isEnclosedIn(c2, c1)) {
                     // c2 is enclosed in c1, so c1 must be processed sooner
                     return -1;
                 } else {
-                    return 0;
+                    // we really only need partial order here,
+                    // but `Comparator` must establish total order
+                    return c1.name().compareTo(c2.name());
                 }
             }
         });