Fix various issues related to comparing method references.

This commit is contained in:
Ben Gruver
2012-12-29 14:50:15 -08:00
parent e77b5a7354
commit 7d5439950f
3 changed files with 22 additions and 4 deletions

View File

@ -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;
}