Return-Path: Delivered-To: apmail-harmony-commits-archive@www.apache.org Received: (qmail 39793 invoked from network); 5 Dec 2006 11:16:28 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 5 Dec 2006 11:16:28 -0000 Received: (qmail 82139 invoked by uid 500); 5 Dec 2006 11:16:36 -0000 Delivered-To: apmail-harmony-commits-archive@harmony.apache.org Received: (qmail 82118 invoked by uid 500); 5 Dec 2006 11:16:36 -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 Received: (qmail 82109 invoked by uid 99); 5 Dec 2006 11:16:36 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Dec 2006 03:16:36 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Dec 2006 03:16:27 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 3F6D01A9846; Tue, 5 Dec 2006 03:15:45 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r482597 - in /harmony/enhanced/classlib/trunk/modules/security/src: main/java/common/java/security/Signer.java test/api/java/org/apache/harmony/security/tests/java/security/SignerTest.java Date: Tue, 05 Dec 2006 11:15:44 -0000 To: commits@harmony.apache.org From: smishura@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061205111546.3F6D01A9846@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: smishura Date: Tue Dec 5 03:15:38 2006 New Revision: 482597 URL: http://svn.apache.org/viewvc?view=rev&rev=482597 Log: Fix and regression test for HARMONY-2408 ([classlib][security] java.security.Signer.setKeyPair(null) throws InvalidParameterException while RI throws NPE) Modified: harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/Signer.java harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/SignerTest.java Modified: harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/Signer.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/Signer.java?view=diff&rev=482597&r1=482596&r2=482597 ============================================================================== --- harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/Signer.java (original) +++ harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/Signer.java Tue Dec 5 03:15:38 2006 @@ -81,8 +81,12 @@ */ public final void setKeyPair(KeyPair pair) throws InvalidParameterException, KeyException { - if ((pair == null) || (pair.getPrivate() == null) - || (pair.getPublic() == null)) { + + if (pair == null) { + throw new NullPointerException(); + } + + if ((pair.getPrivate() == null) || (pair.getPublic() == null)) { throw new InvalidParameterException(); } SecurityManager sm = System.getSecurityManager(); Modified: harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/SignerTest.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/SignerTest.java?view=diff&rev=482597&r1=482596&r2=482597 ============================================================================== --- harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/SignerTest.java (original) +++ harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/SignerTest.java Tue Dec 5 03:15:38 2006 @@ -147,6 +147,14 @@ */ public void test_setKeyPairLjava_security_KeyPair() throws Exception { + // Regression for HARMONY-2408 + // test: NullPointerException if pair is null + try { + new SignerStub("name").setKeyPair(null); + fail("No expected NullPointerException"); + } catch (NullPointerException e) { + } + // test: SecurityException if permission is denied SecurityManager oldSm = System.getSecurityManager(); MySecurityManager sm = new MySecurityManager();