Return-Path: Delivered-To: apmail-incubator-harmony-commits-archive@www.apache.org Received: (qmail 74899 invoked from network); 18 Jul 2006 00:22:06 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 18 Jul 2006 00:22:05 -0000 Received: (qmail 2993 invoked by uid 500); 18 Jul 2006 00:22:05 -0000 Delivered-To: apmail-incubator-harmony-commits-archive@incubator.apache.org Received: (qmail 2940 invoked by uid 500); 18 Jul 2006 00:22:05 -0000 Mailing-List: contact harmony-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: harmony-dev@incubator.apache.org Delivered-To: mailing list harmony-commits@incubator.apache.org Received: (qmail 2927 invoked by uid 99); 18 Jul 2006 00:22:05 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 17 Jul 2006 17:22:05 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 17 Jul 2006 17:22:04 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id A08251A981A; Mon, 17 Jul 2006 17:21:44 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r422927 - in /incubator/harmony/enhanced/classlib/trunk/modules/archive/src: main/java/java/util/jar/JarEntry.java test/java/org/apache/harmony/archive/tests/java/util/jar/JarEntryTest.java Date: Tue, 18 Jul 2006 00:21:44 -0000 To: harmony-commits@incubator.apache.org From: ndbeyer@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060718002144.A08251A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: ndbeyer Date: Mon Jul 17 17:21:43 2006 New Revision: 422927 URL: http://svn.apache.org/viewvc?rev=422927&view=rev Log: Apply patch for HARMONY-899: JarEntry.getSodeSigners() throws NPE if certificates are null Modified: incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/jar/JarEntry.java incubator/harmony/enhanced/classlib/trunk/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarEntryTest.java Modified: incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/jar/JarEntry.java URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/jar/JarEntry.java?rev=422927&r1=422926&r2=422927&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/jar/JarEntry.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/jar/JarEntry.java Mon Jul 17 17:21:43 2006 @@ -134,6 +134,9 @@ } private CodeSigner[] getCodeSigners(Certificate[] certs) { + if(null == certs) { + return null; + } X500Principal prevIssuer = null; ArrayList list = new ArrayList(certs.length); Modified: incubator/harmony/enhanced/classlib/trunk/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarEntryTest.java URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarEntryTest.java?rev=422927&r1=422926&r2=422927&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarEntryTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarEntryTest.java Mon Jul 17 17:21:43 2006 @@ -137,6 +137,9 @@ } assertEquals(2,certs_bob.size()); assertEquals(1,certs_alice.size()); + + assertNull("getCodeSigners() of a primitive JarEntry should return null", + new JarEntry("aaa").getCodeSigners()); } /**