Use try-with-resources where possible

jenkinsci · Dec 17, 2024 · b7ed6a3 · b7ed6a3
1 parent f22af57
commit b7ed6a3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/src/main/java/hudson/plugins/ec2/ssh/EC2MacLauncher.java b/src/main/java/hudson/plugins/ec2/ssh/EC2MacLauncher.java
@@ -352,14 +352,10 @@ private File createIdentityKeyFile(EC2Computer computer) throws IOException {
         File tempFile = Files.createTempFile("ec2_", ".pem").toFile();
 
         try {
-            FileOutputStream fileOutputStream = new FileOutputStream(tempFile);
-            OutputStreamWriter writer = new OutputStreamWriter(fileOutputStream, StandardCharsets.UTF_8);
-            try {
+            try (FileOutputStream fileOutputStream = new FileOutputStream(tempFile);
+                    OutputStreamWriter writer = new OutputStreamWriter(fileOutputStream, StandardCharsets.UTF_8)) {
                 writer.write(privateKey);
                 writer.flush();
-            } finally {
-                writer.close();
-                fileOutputStream.close();
             }
             FilePath filePath = new FilePath(tempFile);
             filePath.chmod(0400); // octal file mask - readonly by owner

diff --git a/src/main/java/hudson/plugins/ec2/ssh/EC2UnixLauncher.java b/src/main/java/hudson/plugins/ec2/ssh/EC2UnixLauncher.java
@@ -358,14 +358,10 @@ private File createIdentityKeyFile(EC2Computer computer) throws IOException {
         File tempFile = Files.createTempFile("ec2_", ".pem").toFile();
 
         try {
-            FileOutputStream fileOutputStream = new FileOutputStream(tempFile);
-            OutputStreamWriter writer = new OutputStreamWriter(fileOutputStream, StandardCharsets.UTF_8);
-            try {
+            try (FileOutputStream fileOutputStream = new FileOutputStream(tempFile);
+                    OutputStreamWriter writer = new OutputStreamWriter(fileOutputStream, StandardCharsets.UTF_8)) {
                 writer.write(privateKey);
                 writer.flush();
-            } finally {
-                writer.close();
-                fileOutputStream.close();
             }
             FilePath filePath = new FilePath(tempFile);
             filePath.chmod(0400); // octal file mask - readonly by owner