[utilities COMMIT] in /spring-extensions/trunk: doc/RELEASE-NOTES.txt src/main/java/net/shibboleth/ext/spring/factory...

[noreply at shibboleth.net]

Author: iay
Date: Fri May 30 05:31:12 2014
New Revision: 572

URL: http://svn.shibboleth.net/view/utilities?rev=572&view=rev
Log:
JSE-2 factory beans leave created stream open

Modified:
    spring-extensions/trunk/doc/RELEASE-NOTES.txt
    spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/DomDocumentFactoryBean.java
    spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/PrivateKeyFactoryBean.java
    spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/PublicKeyFactoryBean.java
    spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/X509CertificateChainFactoryBean.java
    spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/X509CertificateFactoryBean.java

Modified: spring-extensions/trunk/doc/RELEASE-NOTES.txt
URL: http://svn.shibboleth.net/view/utilities/spring-extensions/trunk/doc/RELEASE-NOTES.txt?rev=572&r1=571&r2=572&view=diff
==============================================================================
--- spring-extensions/trunk/doc/RELEASE-NOTES.txt (original)
+++ spring-extensions/trunk/doc/RELEASE-NOTES.txt Fri May 30 05:31:12 2014
@@ -1,0 +1,3 @@
+
+** Bug fixes:
+    * [JSE-2] - factory beans leave created stream open

Modified: spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/DomDocumentFactoryBean.java
URL: http://svn.shibboleth.net/view/utilities/spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/DomDocumentFactoryBean.java?rev=572&r1=571&r2=572&view=diff
==============================================================================
--- spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/DomDocumentFactoryBean.java (original)
+++ spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/DomDocumentFactoryBean.java Fri May 30 05:31:12 2014
@@ -16,6 +16,8 @@
  */
 
 package net.shibboleth.ext.spring.factory;
+
+import java.io.InputStream;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -70,7 +72,9 @@
                 throw new BeanCreationException("ParserPool must be provided in order to use this factory.");
             }
             
-            document = parserPool.parse(documentResource.getInputStream());
+            try (InputStream is = documentResource.getInputStream()) {
+                document = parserPool.parse(is);
+            }
         }
         
         return document;

Modified: spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/PrivateKeyFactoryBean.java
URL: http://svn.shibboleth.net/view/utilities/spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/PrivateKeyFactoryBean.java?rev=572&r1=571&r2=572&view=diff
==============================================================================
--- spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/PrivateKeyFactoryBean.java (original)
+++ spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/PrivateKeyFactoryBean.java Fri May 30 05:31:12 2014
@@ -19,6 +19,7 @@
 
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.InputStream;
 import java.security.PrivateKey;
 
 import javax.annotation.Nonnull;
@@ -72,10 +73,12 @@
                 throw new BeanCreationException("Private key file must be provided in order to use this factory.");
             }
 
-            if (keyPass == null) {
-                key = KeyPairUtil.readPrivateKey(new FileInputStream(keyFile));
-            } else {
-                key = KeyPairUtil.readPrivateKey(new FileInputStream(keyFile), keyPass.toCharArray());
+            try (InputStream is = new FileInputStream(keyFile)) {
+                if (keyPass == null) {
+                    key = KeyPairUtil.readPrivateKey(is);
+                } else {
+                    key = KeyPairUtil.readPrivateKey(is, keyPass.toCharArray());
+                }
             }
         }
 

Modified: spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/PublicKeyFactoryBean.java
URL: http://svn.shibboleth.net/view/utilities/spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/PublicKeyFactoryBean.java?rev=572&r1=571&r2=572&view=diff
==============================================================================
--- spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/PublicKeyFactoryBean.java (original)
+++ spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/PublicKeyFactoryBean.java Fri May 30 05:31:12 2014
@@ -19,6 +19,7 @@
 
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.InputStream;
 import java.security.PublicKey;
 
 import javax.annotation.Nonnull;
@@ -58,7 +59,9 @@
                 throw new BeanCreationException("Public key file must be provided in order to use this factory.");
             }
 
-            key = KeyPairUtil.readPublicKey(new FileInputStream(keyFile));
+            try (InputStream is = new FileInputStream(keyFile)) {
+                key = KeyPairUtil.readPublicKey(is);
+            }
         }
 

[... 52 lines stripped ...]