This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-bcel.git
The following commit(s) were added to refs/heads/master by this push: new 84a4c331 Use try-with-resources 84a4c331 is described below commit 84a4c3317ac0108a7539f9caf80e74511d8a57b6 Author: Gary David Gregory (Code signing key) <ggreg...@apache.org> AuthorDate: Fri Oct 7 13:45:05 2022 -0400 Use try-with-resources --- src/examples/JasminVisitor.java | 7 ++++--- src/examples/Mini/MiniC.java | 8 ++++---- src/examples/Package.java | 26 +++++++++++++------------- 3 files changed, 21 insertions(+), 20 deletions(-) diff --git a/src/examples/JasminVisitor.java b/src/examples/JasminVisitor.java index b6b201e4..a2a7e6e1 100644 --- a/src/examples/JasminVisitor.java +++ b/src/examples/JasminVisitor.java @@ -80,9 +80,10 @@ public class JasminVisitor extends org.apache.bcel.classfile.EmptyVisitor { } final String name = path + className + ".j"; - final FileOutputStream out = new FileOutputStream(name); - new JasminVisitor(java_class, out).disassemble(); - System.out.println("File dumped to: " + name); + try (final FileOutputStream out = new FileOutputStream(name)) { + new JasminVisitor(java_class, out).disassemble(); + System.out.println("File dumped to: " + name); + } } } diff --git a/src/examples/Mini/MiniC.java b/src/examples/Mini/MiniC.java index 95def304..349183d1 100644 --- a/src/examples/Mini/MiniC.java +++ b/src/examples/Mini/MiniC.java @@ -149,13 +149,13 @@ public class MiniC implements org.apache.bcel.Constants { clazz.dump(base_name + ".class"); } else { System.out.println("Pass 5: Generating Java code ..."); - final PrintWriter out = new PrintWriter(new FileOutputStream(base_name + ".java")); - program.code(out, base_name); - out.close(); + try (final PrintWriter out = new PrintWriter(new FileOutputStream(base_name + ".java"))) { + program.code(out, base_name); + } System.out.println("Pass 6: Compiling Java code ..."); - final String[] args = {"javac", base_name + ".java"}; + final String[] args = { "javac", base_name + ".java" }; // sun.tools.javac.Main compiler = new sun.tools.javac.Main(System.err, "javac"); try { final Process p = Runtime.getRuntime().exec(args); diff --git a/src/examples/Package.java b/src/examples/Package.java index ca7b1191..a5897a18 100644 --- a/src/examples/Package.java +++ b/src/examples/Package.java @@ -213,20 +213,20 @@ public class Package { } // create the jar - final JarOutputStream jarFile = new JarOutputStream(new FileOutputStream(defaultJar)); - jarFile.setLevel(5); // use compression - int written = 0; - for (final String name : allClasses.keySet()) { // add entries for every class - final JavaClass claz = allClasses.get(name); - final ZipEntry zipEntry = new ZipEntry(name + ".class"); - final byte[] bytes = claz.getBytes(); - final int length = bytes.length; - jarFile.putNextEntry(zipEntry); - jarFile.write(bytes, 0, length); - written += length; // for logging + try (final JarOutputStream jarFile = new JarOutputStream(new FileOutputStream(defaultJar))) { + jarFile.setLevel(5); // use compression + int written = 0; + for (final String name : allClasses.keySet()) { // add entries for every class + final JavaClass claz = allClasses.get(name); + final ZipEntry zipEntry = new ZipEntry(name + ".class"); + final byte[] bytes = claz.getBytes(); + final int length = bytes.length; + jarFile.putNextEntry(zipEntry); + jarFile.write(bytes, 0, length); + written += length; // for logging + } + System.err.println("The jar file contains " + allClasses.size() + " classes and contains " + written + " bytes"); } - jarFile.close(); - System.err.println("The jar file contains " + allClasses.size() + " classes and contains " + written + " bytes"); if (!notFound.isEmpty()) { System.err.println(notFound.size() + " classes could not be found");