svn commit: r966792 - in /ofbiz/branches/release10.04: ./ framework/base/src/org/ofbiz/base/util/KeyStoreUtil.java

[doogie]

Author: doogie
Date: Thu Jul 22 18:37:50 2010
New Revision: 966792

URL: http://svn.apache.org/viewvc?rev=966792&view=rev
Log:
Applied fix from trunk for revision: 966785 
 Fix file leak problem in KeyStore, the stream must be closed by the

Modified:
    ofbiz/branches/release10.04/   (props changed)
    
ofbiz/branches/release10.04/framework/base/src/org/ofbiz/base/util/KeyStoreUtil.java

Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 22 18:37:50 2010
@@ -1,3 +1,3 @@
 /ofbiz/branches/addbirt:831210-885099,885686-886087
 /ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958953,960491,960997,963610,964558,965470,965916,966525
+/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958953,960491,960997,963610,964558,965470,965916,966525,966785

Modified: 
ofbiz/branches/release10.04/framework/base/src/org/ofbiz/base/util/KeyStoreUtil.java
URL: 
http://svn.apache.org/viewvc/ofbiz/branches/release10.04/framework/base/src/org/ofbiz/base/util/KeyStoreUtil.java?rev=966792&r1=966791&r2=966792&view=diff
==============================================================================
--- 
ofbiz/branches/release10.04/framework/base/src/org/ofbiz/base/util/KeyStoreUtil.java
 (original)
+++ 
ofbiz/branches/release10.04/framework/base/src/org/ofbiz/base/util/KeyStoreUtil.java
 Thu Jul 22 18:37:50 2010
@@ -66,7 +66,11 @@ public class KeyStoreUtil {
         ComponentConfig.KeystoreInfo ks = 
ComponentConfig.getKeystoreInfo(componentName, keyStoreName);
         File file = 
FileUtil.getFile(ks.createResourceHandler().getFullLocation());
         FileOutputStream out = new FileOutputStream(file);
-        store.store(out, ks.getPassword().toCharArray());
+        try {
+            store.store(out, ks.getPassword().toCharArray());
+        } finally {
+            out.close();
+        }
     }
 
     public static KeyStore getComponentKeyStore(String componentName, String 
keyStoreName) throws IOException, GeneralSecurityException, 
GenericConfigException {
@@ -83,7 +87,12 @@ public class KeyStoreUtil {
             throw new IOException("Invalid keystore type; null");
         }
         KeyStore ks = KeyStore.getInstance(type);
-        ks.load(url.openStream(), password.toCharArray());
+        InputStream in = url.openStream();
+        try {
+            ks.load(in, password.toCharArray());
+        } finally {
+            in.close();
+        }
         return ks;
     }
 
@@ -107,7 +116,12 @@ public class KeyStoreUtil {
         }
 
         if (keyFile.exists() && keyFile.canRead()) {
-            ks.load(new FileInputStream(keyFile), password.toCharArray());
+            InputStream in = new FileInputStream(keyFile);
+            try {
+                ks.load(in, password.toCharArray());
+            } finally {
+                in.close();
+            }
         } else {
             ks.load(null, "changeit".toCharArray());
         }