From d19a3d76d357fcb4db56b97bbf65676541c3d691 Mon Sep 17 00:00:00 2001
From: Andreas Lundblad <alundblad@openjdk.org>
Date: Wed, 10 Jun 2015 11:18:10 +0200
Subject: [PATCH] 8087115: Due to a javac type inference issue, sjavac doesn't
 compile with 8u31

Added explicit type arguments.

Reviewed-by: jlahoda
---
 .../jdk.compiler/share/classes/com/sun/tools/sjavac/Util.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/Util.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/Util.java
index c29c39ff5ac..569d9e6f997 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/Util.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/Util.java
@@ -228,6 +228,6 @@ public class Util {
 
     public static <I, T> Map<I, T> indexBy(Collection<? extends T> c,
                                            Function<? super T, ? extends I> indexFunction) {
-        return c.stream().collect(Collectors.toMap(indexFunction, o -> o));
+        return c.stream().collect(Collectors.<T, I, T>toMap(indexFunction, o -> o));
     }
 }