harmony-commits mailing list archives

Author: tonywu
Date: Wed Dec 10 23:05:28 2008
New Revision: 725600

URL: http://svn.apache.org/viewvc?rev=725600&view=rev
Log:
When using create a Builder instance by Builder.newInstance(KeyStore ks, PasswordProtection
pp), getKeyStore() should return the same KeyStore as RI6 does.

Modified:
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/KeyStore.java
    harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/KeyStore3Test.java

Modified: harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/KeyStore.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/KeyStore.java?rev=725600&r1=725599&r2=725600&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/KeyStore.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/KeyStore.java
Wed Dec 10 23:05:28 2008
@@ -691,8 +691,7 @@
 
                     
                     isGetKeyStore = true;
-                    keyStore = ks;
-                    return keyStore;
+                    return ks;
                 } catch (KeyStoreException e) {
                     // Store exception
                     throw lastException = e;

Modified: harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/KeyStore3Test.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/KeyStore3Test.java?rev=725600&r1=725599&r2=725600&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/KeyStore3Test.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/KeyStore3Test.java
Wed Dec 10 23:05:28 2008
@@ -156,7 +156,7 @@
             NoSuchAlgorithmException, CertificateException,
             FileNotFoundException, IOException {
 
-        String alias = "JKS";
+        String alias = "BKS";
         char[] pwd = new char[] { '1', '2', '3', '4', '5', '6' };
         InputStream fis = KeyStore2Test.class
                 .getResourceAsStream("builderimpl.ks");