From 2d932ec02c19110e20b32b46e29c1aee1d08f7c0 Mon Sep 17 00:00:00 2001 From: Mark Thomas Date: Wed, 5 Jul 2023 14:08:47 +0100 Subject: [PATCH] Use try-with-resources Stop Coverity Scan complaining --- .../tomcat/buildutil/MimeTypeMappings.java | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/java/org/apache/tomcat/buildutil/MimeTypeMappings.java b/java/org/apache/tomcat/buildutil/MimeTypeMappings.java index 1190a628f6ed..3f467ad7d5f5 100644 --- 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 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 mapping : sortedWebXmlMimeMappings.entrySet()) { - w.write(mapping.getKey()); - w.write("="); - w.write(mapping.getValue()); w.write(System.lineSeparator()); - } - w.close(); - fos.close(); + for (Map.Entry mapping : sortedWebXmlMimeMappings.entrySet()) { + w.write(mapping.getKey()); + w.write("="); + w.write(mapping.getValue()); + w.write(System.lineSeparator()); + } + } } }