You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2016/06/17 17:47:58 UTC

svn commit: r1748883 - /commons/proper/bcel/trunk/src/test/java/org/apache/bcel/util/BCELifierTestCase.java

Author: ggregory
Date: Fri Jun 17 17:47:58 2016
New Revision: 1748883

URL: http://svn.apache.org/viewvc?rev=1748883&view=rev
Log:
Use try-with-resources.

Modified:
    commons/proper/bcel/trunk/src/test/java/org/apache/bcel/util/BCELifierTestCase.java

Modified: commons/proper/bcel/trunk/src/test/java/org/apache/bcel/util/BCELifierTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/bcel/util/BCELifierTestCase.java?rev=1748883&r1=1748882&r2=1748883&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/util/BCELifierTestCase.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/bcel/util/BCELifierTestCase.java Fri Jun 17 17:47:58 2016
@@ -42,10 +42,10 @@ public class BCELifierTestCase {
         JavaClass java_class = BCELifier.getJavaClass(infile.getName().replace(".class", ""));
         assertNotNull(java_class);
         File outfile = new File(workDir, infile.getName().replace(".class", "Creator.java"));
-        FileOutputStream fos = new FileOutputStream(outfile);
-        BCELifier bcelifier = new BCELifier(java_class, fos);
-        bcelifier.start();
-        fos.close();
+        try (FileOutputStream fos = new FileOutputStream(outfile)) {
+            BCELifier bcelifier = new BCELifier(java_class, fos);
+            bcelifier.start();
+        }
         exec(workDir, "javac", "-cp", "classes", outfile.getName());
         exec(workDir, "java", "-cp", "." + File.pathSeparator + "classes", outfile.getName().replace(".java", ""));
         final String output = exec(workDir, "javap", "-p", "-c", infile.getName());
@@ -65,21 +65,21 @@ public class BCELifierTestCase {
         ProcessBuilder pb = new ProcessBuilder(args);
         pb.directory(workDir);
         Process proc = pb.start();
-        BufferedInputStream is = new BufferedInputStream(proc.getInputStream());
-        InputStream es = proc.getErrorStream();
-        proc.waitFor();
-        byte[] buff = new byte[2048];
-        int len;
-        while ((len = es.read(buff)) != -1) {
-            System.err.print(new String(buff, 0, len));
-        }
+        try (BufferedInputStream is = new BufferedInputStream(proc.getInputStream());
+                InputStream es = proc.getErrorStream()) {
+            proc.waitFor();
+            byte[] buff = new byte[2048];
+            int len;
+            while ((len = es.read(buff)) != -1) {
+                System.err.print(new String(buff, 0, len));
+            }
 
-        StringBuilder sb = new StringBuilder();
-        while ((len = is.read(buff)) != -1) {
-            sb.append(new String(buff, 0, len));
+            StringBuilder sb = new StringBuilder();
+            while ((len = is.read(buff)) != -1) {
+                sb.append(new String(buff, 0, len));
+            }
+            return sb.toString();
         }
-        is.close();
-        return sb.toString();
     }
 
 }