Workaround javac 1.7 bug

--
MOS_MIGRATED_REVID=108243881

1 files changed, 3 insertions, 1 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/graph/Digraph.java b/src/main/java/com/google/devtools/build/lib/graph/Digraph.java
index bc87c9f2a8..c2e7d0d378 100644
--- a/src/main/java/com/google/devtools/build/lib/graph/Digraph.java
+++ b/src/main/java/com/google/devtools/build/lib/graph/Digraph.java
@@ -1060,7 +1060,9 @@ public final class Digraph<T> implements Cloneable {
       return unordered;
     }
     List<Node<T>> result = new ArrayList<>(unordered);
-    Collections.sort(result, makeNodeComparator(comparator));
+    // Do not inline this variable: a workaround for Java 7 type inference.
+    Comparator<Node<T>> nodeComparator = makeNodeComparator(comparator);
+    Collections.sort(result, nodeComparator);
     return result;
   }