Use try-with-resources

Stop Coverity Scan complaining
apache · Jul 5, 2023 · 2d932ec · 2d932ec
1 parent 171cfff
commit 2d932ec
Showing 1 changed file with 10 additions and 12 deletions.
diff --git a/java/org/apache/tomcat/buildutil/MimeTypeMappings.java b/java/org/apache/tomcat/buildutil/MimeTypeMappings.java
@@ -52,21 +52,19 @@ public static void main(String... args) throws Exception {
         SortedMap<String, String> sortedWebXmlMimeMappings = new TreeMap<>(webXmlMimeMappings);
 
         File f = new File("java/org/apache/catalina/startup/MimeTypeMappings.properties");
-        FileOutputStream fos = new FileOutputStream(f);
-        Writer w = new OutputStreamWriter(fos, StandardCharsets.US_ASCII);
+        try (FileOutputStream fos = new FileOutputStream(f);
+                Writer w = new OutputStreamWriter(fos, StandardCharsets.US_ASCII)) {
 
-        Utils.insertLicense(w);
+            Utils.insertLicense(w);
 
-        w.write(System.lineSeparator());
-
-        for (Map.Entry<String, String> mapping : sortedWebXmlMimeMappings.entrySet()) {
-            w.write(mapping.getKey());
-            w.write("=");
-            w.write(mapping.getValue());
             w.write(System.lineSeparator());
-        }
 
-        w.close();
-        fos.close();
+            for (Map.Entry<String, String> mapping : sortedWebXmlMimeMappings.entrySet()) {
+                w.write(mapping.getKey());
+                w.write("=");
+                w.write(mapping.getValue());
+                w.write(System.lineSeparator());
+            }
+        }
     }
 }