svn commit: r1917981 - /db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/ControlConfigurationXmlParser.java

Author: tv
Date: Sun May 26 15:01:32 2024
New Revision: 1917981

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

Modified:
    db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/ControlConfigurationXmlParser.java

Modified: db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/ControlConfigurationXmlParser.java
URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/ControlConfigurationXmlParser.java?rev=1917981&r1=1917980&r2=1917981&view=diff
==============================================================================
--- db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/ControlConfigurationXmlParser.java (original)
+++ db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/ControlConfigurationXmlParser.java Sun May 26 15:01:32 2024
@@ -91,11 +91,11 @@ public class ControlConfigurationXmlPars
             final ConfigurationHandlers configurationHandlers)
                     throws ConfigurationException
     {
-        InputStream controlConfigurationInputStream
-        = configurationProvider.getControlConfigurationInputStream();
-        try
+        ControlConfiguration result = new ControlConfiguration();
+
+        try (InputStream controlConfigurationInputStream
+                = configurationProvider.getControlConfigurationInputStream())
         {
-            ControlConfiguration result = new ControlConfiguration();
             try
             {
                 SAXParser parser = saxFactory.newSAXParser();
@@ -134,18 +134,12 @@ public class ControlConfigurationXmlPars
                                 + e.getMessage(),
                                 e);
             }
-            return result;
         }
-        finally
+        catch (IOException e)
         {
-            try
-            {
-                controlConfigurationInputStream.close();
-            }
-            catch (IOException e)
-            {
-                log.warn("Could not close controlConfigurationInputStream", e);
-            }
+            log.warn("Could not close controlConfigurationInputStream", e);
         }
+
+        return result;
     }
 }