SXP: Free resources after reading them

DEVSIX-2314

Author: Snipx

styled-xml-parser/src/main/java/com/itextpdf/styledxmlparser/resolver/resource/ResourceResolver.java

@@ -163,9 +163,13 @@ public InputStream retrieveStyleSheet(String uri) throws IOException {
      */
     @Deprecated
     public byte[] retrieveStream(String src) {
-        try {
-            return StreamUtil.inputStreamToArray(retrieveResourceAsInputStream(src));
-        }catch(Exception e){
+        try (InputStream stream = retrieveResourceAsInputStream(src)) {
+            if (stream != null) {
+                return StreamUtil.inputStreamToArray(stream);
+            } else {
+                return null;
+            }
+        } catch (Exception e) {
             Logger logger = LoggerFactory.getLogger(ResourceResolver.class);
             logger.error(MessageFormatUtil.format(LogMessageConstant.UNABLE_TO_RETRIEVE_STREAM_WITH_GIVEN_BASE_URI, uriResolver.getBaseUri(), src), e);
             return null;
@@ -180,20 +184,17 @@ public byte[] retrieveStream(String src) {
      * @return byte[] on success, otherwise null.
      */
     public byte[] retrieveBytesFromResource(String src) {
-        InputStream stream = retrieveResourceAsInputStream(src);
-        if(stream !=null) {
-            try {
+        try (InputStream stream = retrieveResourceAsInputStream(src)) {
+            if (stream != null) {
                 return StreamUtil.inputStreamToArray(stream);
-            }catch(IOException ioe){
-                Logger logger = LoggerFactory.getLogger(ResourceResolver.class);
-                logger.error(MessageFormatUtil.format(LogMessageConstant.UNABLE_TO_RETRIEVE_STREAM_WITH_GIVEN_BASE_URI, uriResolver.getBaseUri(), src), ioe);
+            } else {
                 return null;
             }
-        }else{
+        } catch (IOException ioe) {
+            Logger logger = LoggerFactory.getLogger(ResourceResolver.class);
+            logger.error(MessageFormatUtil.format(LogMessageConstant.UNABLE_TO_RETRIEVE_STREAM_WITH_GIVEN_BASE_URI, uriResolver.getBaseUri(), src), ioe);
             return null;
         }
-
-
     }
 
     /**

styled-xml-parser/src/test/java/com/itextpdf/styledxmlparser/resolver/resource/ResourceResolverTest.java

@@ -49,26 +49,27 @@ This file is part of the iText (R) project.
 import com.itextpdf.test.annotations.LogMessage;
 import com.itextpdf.test.annotations.LogMessages;
 import com.itextpdf.test.annotations.type.UnitTest;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.Files;
 import org.junit.Assert;
 import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.rules.ExpectedException;
 
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+
 @Category(UnitTest.class)
 public class ResourceResolverTest extends ExtendedITextTest {
     private final String baseUri = "./src/test/resources/com/itextpdf/styledxmlparser/resolver/retrieveStreamTest/";
     @Rule
     public ExpectedException junitExpectedException = ExpectedException.none();
 
     @Test
-    @LogMessages(messages = @LogMessage(messageTemplate = LogMessageConstant.UNABLE_TO_RETRIEVE_STREAM_WITH_GIVEN_BASE_URI, count = 2))
+    @LogMessages(messages = @LogMessage(messageTemplate = LogMessageConstant.UNABLE_TO_RETRIEVE_STREAM_WITH_GIVEN_BASE_URI, count = 1))
     public void malformedResourceNameTest() {
         String fileName = "resourceResolverTest .png";
         ResourceResolver resourceResolver = new ResourceResolver(baseUri);