Use try with resources

apache · May 9, 2023 · f6a4226 · f6a4226
1 parent 5e5e61a
commit f6a4226
Showing 1 changed file with 9 additions and 25 deletions.
diff --git a/src/main/java/org/apache/commons/imaging/icc/IccProfileParser.java b/src/main/java/org/apache/commons/imaging/icc/IccProfileParser.java
@@ -50,44 +50,28 @@ public IccProfileInfo getICCProfileInfo(final byte[] bytes) {
     }
 
     public IccProfileInfo getICCProfileInfo(final ByteSource byteSource) {
-
-        InputStream is = null;
-
+        // TODO Throw instead of logging?
+        final IccProfileInfo result;
+        try (InputStream is = byteSource.getInputStream()) {
+            result = readICCProfileInfo(is);
+        } catch (final Exception e) {
+            LOGGER.log(Level.SEVERE, e.getMessage(), e);
+            return null;
+        }
+        //
         try {
-
-            is = byteSource.getInputStream();
-            final IccProfileInfo result = readICCProfileInfo(is);
-
-            if (result == null) {
-                return null;
-            }
-
-            is.close();
-            is = null;
-
             for (final IccTag tag : result.getTags()) {
                 final byte[] bytes = byteSource.getBlock(tag.offset, tag.length);
                 // Debug.debug("bytes: " + bytes.length);
                 tag.setData(bytes);
                 // tag.dump("\t" + i + ": ");
             }
             // result.fillInTagData(byteSource);
-
             return result;
         } catch (final Exception e) {
             // Debug.debug("Error: " + file.getAbsolutePath());
             LOGGER.log(Level.SEVERE, e.getMessage(), e);
-        } finally {
-            try {
-                if (is != null) {
-                    is.close();
-                }
-            } catch (final Exception e) {
-                LOGGER.log(Level.SEVERE, e.getMessage(), e);
-            }
-
         }
-
         return null;
     }