Author: jdillon
Date: Wed Aug  2 07:12:30 2006
New Revision: 427987

URL: http://svn.apache.org/viewvc?rev=427987&view=rev
Log:
 r603@dyn456093 (orig r427184):  jbohn | 2006-07-31 10:44:33 -0700
 GERONIMO-2252 save key password as char[]

Modified:
    geronimo/sandbox/svkmerge/trunk/   (props changed)
    geronimo/sandbox/svkmerge/trunk/modules/security/src/java/org/apache/geronimo/security/keystore/FileKeystoreInstance.java

Propchange: geronimo/sandbox/svkmerge/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Wed Aug  2 07:12:30 2006
@@ -1,2 +1,2 @@
 13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/m2migration:419395
-13f79535-47bb-0310-9956-ffa450edef68:/geronimo/trunk:427123
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/trunk:427184

Modified: geronimo/sandbox/svkmerge/trunk/modules/security/src/java/org/apache/geronimo/security/keystore/FileKeystoreInstance.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/modules/security/src/java/org/apache/geronimo/security/keystore/FileKeystoreInstance.java?rev=427987&r1=427986&r2=427987&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/modules/security/src/java/org/apache/geronimo/security/keystore/FileKeystoreInstance.java (original)
+++ geronimo/sandbox/svkmerge/trunk/modules/security/src/java/org/apache/geronimo/security/keystore/FileKeystoreInstance.java Wed Aug  2 07:12:30 2006
@@ -203,7 +203,7 @@
                 buf.append("]![");
             }
             Map.Entry entry = (Map.Entry) it.next();
-            buf.append(entry.getKey()).append("=").append(entry.getValue());
+            buf.append(entry.getKey()).append("=").append((char[])entry.getValue());
         }
         try {
             kernel.setAttribute(abstractName, "keyPasswords", buf.length() == 0 ? null : buf.toString());