Fri, 26 Jul 2013 14:08:37 -0700
Merge
1.1 --- a/.hgtags Thu Jul 25 14:51:40 2013 +0100 1.2 +++ b/.hgtags Fri Jul 26 14:08:37 2013 -0700 1.3 @@ -220,3 +220,5 @@ 1.4 988aef3a8c3adac482363293f65e77ec4c5ce98d jdk8-b96 1.5 6a11a81a8824c17f6cd2ec8f8492e1229b694e96 jdk8-b97 1.6 ce5a90df517bdceb2739d7dd3e6764b070def802 jdk8-b98 1.7 +6d85acab769eb79bc058f5640fa86a6ef096a583 jdk8-b99 1.8 +82f68da70e471ee5640016e3f38c014347a5c785 jdk8-b100
2.1 --- a/test/tools/javac/generics/bridges/BridgeHarness.java Thu Jul 25 14:51:40 2013 +0100 2.2 +++ b/test/tools/javac/generics/bridges/BridgeHarness.java Fri Jul 26 14:08:37 2013 -0700 2.3 @@ -40,6 +40,7 @@ 2.4 import com.sun.tools.javac.util.List; 2.5 2.6 import java.io.File; 2.7 +import java.io.InputStream; 2.8 import java.util.Arrays; 2.9 import java.util.Collections; 2.10 import java.util.HashMap; 2.11 @@ -137,8 +138,8 @@ 2.12 * annotation in the bridge map 2.13 */ 2.14 protected void checkBridges(JavaFileObject jfo) { 2.15 - try { 2.16 - ClassFile cf = ClassFile.read(jfo.openInputStream()); 2.17 + try (InputStream is = jfo.openInputStream()) { 2.18 + ClassFile cf = ClassFile.read(is); 2.19 System.err.println("checking: " + cf.getName()); 2.20 2.21 List<Bridge> bridgeList = bridgesMap.get(cf.getName());