SXP: Free resources after reading them

DEVSIX-2314

Autoported commit.
Original commit hash: [71180b08e]
Manual files:
styled-xml-parser/src/test/java/com/itextpdf/styledxmlparser/resolver/resource/ResourceResolverTest.java

Author: Snipx

itext.tests/itext.styledxmlparser.tests/itext/styledxmlparser/resolver/resource/ResourceResolverTest.cs

@@ -54,7 +54,7 @@ class ResourceResolverTest : ExtendedITextTest {
            .CurrentContext.TestDirectory) + "/resources/itext/styledxmlparser/resolver/retrieveStreamTest/";
 
         [NUnit.Framework.Test]
-        [LogMessage(LogMessageConstant.UNABLE_TO_RETRIEVE_STREAM_WITH_GIVEN_BASE_URI, Count = 2)]
+        [LogMessage(LogMessageConstant.UNABLE_TO_RETRIEVE_STREAM_WITH_GIVEN_BASE_URI, Count = 1)]
         public virtual void malformedResourceNameTest() {
             String fileName = "resourceResolverTest .png";
             ResourceResolver resourceResolver = new ResourceResolver(baseUri);

itext/itext.styledxmlparser/itext/styledxmlparser/resolver/resource/ResourceResolver.cs

@@ -175,7 +175,14 @@ public virtual Stream RetrieveStyleSheet(String uri) {
         [Obsolete]
         public virtual byte[] RetrieveStream(String src) {
             try {
-                return StreamUtil.InputStreamToArray(RetrieveResourceAsInputStream(src));
+                using (Stream stream = RetrieveResourceAsInputStream(src)) {
+                    if (stream != null) {
+                        return StreamUtil.InputStreamToArray(stream);
+                    }
+                    else {
+                        return null;
+                    }
+                }
             }
             catch (Exception e) {
                 ILog logger = LogManager.GetLogger(typeof(iText.StyledXmlParser.Resolver.Resource.ResourceResolver));
@@ -194,19 +201,20 @@ public virtual byte[] RetrieveStream(String src) {
         /// <param name="src">either link to file or base64 encoded stream.</param>
         /// <returns>byte[] on success, otherwise null.</returns>
         public virtual byte[] RetrieveBytesFromResource(String src) {
-            Stream stream = RetrieveResourceAsInputStream(src);
-            if (stream != null) {
-                try {
-                    return StreamUtil.InputStreamToArray(stream);
-                }
-                catch (System.IO.IOException ioe) {
-                    ILog logger = LogManager.GetLogger(typeof(iText.StyledXmlParser.Resolver.Resource.ResourceResolver));
-                    logger.Error(MessageFormatUtil.Format(iText.StyledXmlParser.LogMessageConstant.UNABLE_TO_RETRIEVE_STREAM_WITH_GIVEN_BASE_URI
-                        , uriResolver.GetBaseUri(), src), ioe);
-                    return null;
+            try {
+                using (Stream stream = RetrieveResourceAsInputStream(src)) {
+                    if (stream != null) {
+                        return StreamUtil.InputStreamToArray(stream);
+                    }
+                    else {
+                        return null;
+                    }
                 }
             }
-            else {
+            catch (System.IO.IOException ioe) {
+                ILog logger = LogManager.GetLogger(typeof(iText.StyledXmlParser.Resolver.Resource.ResourceResolver));
+                logger.Error(MessageFormatUtil.Format(iText.StyledXmlParser.LogMessageConstant.UNABLE_TO_RETRIEVE_STREAM_WITH_GIVEN_BASE_URI
+                    , uriResolver.GetBaseUri(), src), ioe);
                 return null;
             }
         }

port-hash

@@ -1 +1 @@
-12da6291f4df3a21df2574d7028b68353bc5a912
+71180b08e7d566226757888776b008557cd50013