Fix various issues related to comparing method references.

1 files changed, 20 insertions, 2 deletions

diff --git a/util/src/main/java/org/jf/util/CollectionUtils.java b/util/src/main/java/org/jf/util/CollectionUtils.java
index 84de6953..23e23dc9 100644
--- a/util/src/main/java/org/jf/util/CollectionUtils.java
+++ b/util/src/main/java/org/jf/util/CollectionUtils.java
@@ -77,9 +77,18 @@ public class CollectionUtils {
                                             @Nonnull Iterable<? extends T> it2) {
         Iterator<? extends T> elements2 = it2.iterator();
         for (T element1: it1) {
-            int res = comparator.compare(element1, elements2.next());
+            T element2;
+            try {
+                element2 = elements2.next();
+            } catch (NoSuchElementException ex) {
+                return 1;
+            }
+            int res = comparator.compare(element1, element2);
             if (res != 0) return res;
         }
+        if (elements2.hasNext()) {
+            return -1;
+        }
         return 0;
     }
 
@@ -87,9 +96,18 @@ public class CollectionUtils {
                                                                           @Nonnull Iterable<? extends T> it2) {
         Iterator<? extends T> elements2 = it2.iterator();
         for (T element1: it1) {
-            int res = element1.compareTo(elements2.next());
+            T element2;
+            try {
+                element2 = elements2.next();
+            } catch (NoSuchElementException ex) {
+                return 1;
+            }
+            int res = element1.compareTo(element2);
             if (res != 0) return res;
         }
+        if (elements2.hasNext()) {
+            return -1;
+        }
         return 0;
     }