Check whether we have a next element instead of accessing it and catc…

…hing the exception. Exceptions are notoriously slow in Java, so we want to avoid that.
JesusFreke · Mar 8, 2022 · 8533431 · 8533431
1 parent 78a8293
commit 8533431
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/dexlib2/src/main/java/org/jf/util/CollectionUtils.java b/dexlib2/src/main/java/org/jf/util/CollectionUtils.java
@@ -78,11 +78,10 @@ public static <T> int compareAsIterable(@Nonnull Comparator<? super T> comparato
         Iterator<? extends T> elements2 = it2.iterator();
         for (T element1: it1) {
             T element2;
-            try {
-                element2 = elements2.next();
-            } catch (NoSuchElementException ex) {
+            if (!elements2.hasNext()) {
                 return 1;
             }
+            element2 = elements2.next();
             int res = comparator.compare(element1, element2);
             if (res != 0) return res;
         }
@@ -97,11 +96,10 @@ public static <T extends Comparable<? super T>> int compareAsIterable(@Nonnull I
         Iterator<? extends T> elements2 = it2.iterator();
         for (T element1: it1) {
             T element2;
-            try {
-                element2 = elements2.next();
-            } catch (NoSuchElementException ex) {
+            if (!elements2.hasNext()) {
                 return 1;
             }
+            element2 = elements2.next();
             int res = element1.compareTo(element2);
             if (res != 0) return res;
         }