changeset 1921:37048aa3ac19

Merge
author lana
date Fri, 26 Jul 2013 14:08:37 -0700
parents dae52d74c1fc 0324dbf07b0f
children 8c4b2987edac
files
diffstat 2 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Jul 25 14:51:40 2013 +0100
+++ b/.hgtags	Fri Jul 26 14:08:37 2013 -0700
@@ -220,3 +220,5 @@
 988aef3a8c3adac482363293f65e77ec4c5ce98d jdk8-b96
 6a11a81a8824c17f6cd2ec8f8492e1229b694e96 jdk8-b97
 ce5a90df517bdceb2739d7dd3e6764b070def802 jdk8-b98
+6d85acab769eb79bc058f5640fa86a6ef096a583 jdk8-b99
+82f68da70e471ee5640016e3f38c014347a5c785 jdk8-b100
--- a/test/tools/javac/generics/bridges/BridgeHarness.java	Thu Jul 25 14:51:40 2013 +0100
+++ b/test/tools/javac/generics/bridges/BridgeHarness.java	Fri Jul 26 14:08:37 2013 -0700
@@ -40,6 +40,7 @@
 import com.sun.tools.javac.util.List;
 
 import java.io.File;
+import java.io.InputStream;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
@@ -137,8 +138,8 @@
      * annotation in the bridge map
      */
     protected void checkBridges(JavaFileObject jfo) {
-        try {
-            ClassFile cf = ClassFile.read(jfo.openInputStream());
+        try (InputStream is = jfo.openInputStream()) {
+            ClassFile cf = ClassFile.read(is);
             System.err.println("checking: " + cf.getName());
 
             List<Bridge> bridgeList = bridgesMap.get(cf.getName());