Return-Path: Delivered-To: apmail-harmony-commits-archive@www.apache.org Received: (qmail 7213 invoked from network); 19 Jun 2007 14:54:21 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 19 Jun 2007 14:54:21 -0000 Received: (qmail 95693 invoked by uid 500); 19 Jun 2007 14:53:54 -0000 Delivered-To: apmail-harmony-commits-archive@harmony.apache.org Received: (qmail 95667 invoked by uid 500); 19 Jun 2007 14:53:54 -0000 Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@harmony.apache.org Delivered-To: mailing list commits@harmony.apache.org Delivered-To: moderator for commits@harmony.apache.org Received: (qmail 94453 invoked by uid 99); 19 Jun 2007 05:44:37 -0000 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r548596 - in /harmony/enhanced/classlib/trunk/modules/security/src: main/java/common/java/security/ test/api/java/org/apache/harmony/security/tests/java/security/ test/impl/java/org/apache/harmony/security/tests/java/security/ Date: Tue, 19 Jun 2007 05:44:13 -0000 To: commits@harmony.apache.org From: leoli@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070619054413.32BBA1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: leoli Date: Mon Jun 18 22:44:12 2007 New Revision: 548596 URL: http://svn.apache.org/viewvc?view=rev&rev=548596 Log: java.security.KeyStore.store(null, null) is allowed. 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 harmony/enhanced/classlib/trunk/modules/security/src/test/impl/java/org/apache/harmony/security/tests/java/security/KeyStore_Impl3Test.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?view=diff&rev=548596&r1=548595&r2=548596 ============================================================================== --- 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 Mon Jun 18 22:44:12 2007 @@ -380,12 +380,8 @@ if (!isInit) { throw new KeyStoreException(NOTINITKEYSTORE); } - if (stream == null) { - throw new IOException(Messages.getString("security.51")); //$NON-NLS-1$ - } - if (password == null) { - throw new IOException(Messages.getString("security.50")); //$NON-NLS-1$ - } + + //Just delegate stream and password to implSpi implSpi.engineStore(stream, password); } 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?view=diff&rev=548596&r1=548595&r2=548596 ============================================================================== --- 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 Mon Jun 18 22:44:12 2007 @@ -143,6 +143,11 @@ mockKeyStore.setCertificateEntry("Alias", null); } + public void test_store_null() throws Exception { + mockKeyStore.load(null, null); + mockKeyStore.store(null, null); + } + protected void setUp() throws Exception { super.setUp(); mockKeyStore = new MyKeyStore(new MyKeyStoreSpi(), null, "MyKeyStore"); Modified: harmony/enhanced/classlib/trunk/modules/security/src/test/impl/java/org/apache/harmony/security/tests/java/security/KeyStore_Impl3Test.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/security/src/test/impl/java/org/apache/harmony/security/tests/java/security/KeyStore_Impl3Test.java?view=diff&rev=548596&r1=548595&r2=548596 ============================================================================== --- harmony/enhanced/classlib/trunk/modules/security/src/test/impl/java/org/apache/harmony/security/tests/java/security/KeyStore_Impl3Test.java (original) +++ harmony/enhanced/classlib/trunk/modules/security/src/test/impl/java/org/apache/harmony/security/tests/java/security/KeyStore_Impl3Test.java Mon Jun 18 22:44:12 2007 @@ -142,11 +142,8 @@ } catch (NullPointerException e) { } - try { - kss[i].store(bos, null); - fail("store(...) does not throw any exception when password is null"); - } catch (IOException e) { - } + //RI does not throw exception while password is null. + kss[i].store(bos, null); kss[i].store(bos, pwd); ByteArrayInputStream bis = new ByteArrayInputStream(bos