Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 53305 invoked from network); 15 Dec 2008 14:31:25 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 15 Dec 2008 14:31:25 -0000 Received: (qmail 91932 invoked by uid 500); 15 Dec 2008 14:31:38 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 91799 invoked by uid 500); 15 Dec 2008 14:31:37 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 91790 invoked by uid 99); 15 Dec 2008 14:31:37 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 15 Dec 2008 06:31:37 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 15 Dec 2008 14:31:24 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 5FAB92388979; Mon, 15 Dec 2008 06:31:04 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r726700 - in /geronimo/server/branches/2.1/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/util: NestedJarFile.java UnpackedJarFile.java Date: Mon, 15 Dec 2008 14:31:04 -0000 To: scm@geronimo.apache.org From: jbohn@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081215143104.5FAB92388979@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jbohn Date: Mon Dec 15 06:31:04 2008 New Revision: 726700 URL: http://svn.apache.org/viewvc?rev=726700&view=rev Log: GERONIMO-4467 Fix NPE - patch by Shawn Jiang - thanks Modified: geronimo/server/branches/2.1/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/util/NestedJarFile.java geronimo/server/branches/2.1/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/util/UnpackedJarFile.java Modified: geronimo/server/branches/2.1/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/util/NestedJarFile.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/util/NestedJarFile.java?rev=726700&r1=726699&r2=726700&view=diff ============================================================================== --- geronimo/server/branches/2.1/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/util/NestedJarFile.java (original) +++ geronimo/server/branches/2.1/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/util/NestedJarFile.java Mon Dec 15 06:31:04 2008 @@ -199,7 +199,7 @@ } if (baseEntry == null) { - throw new IOException("Entry not found: name=" + baseEntry.getName()); + throw new IOException("Entry not found: name=" + zipEntry.getName()); } else if (baseEntry.isDirectory()) { return new DeploymentUtil.EmptyInputStream(); } Modified: geronimo/server/branches/2.1/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/util/UnpackedJarFile.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/util/UnpackedJarFile.java?rev=726700&r1=726699&r2=726700&view=diff ============================================================================== --- geronimo/server/branches/2.1/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/util/UnpackedJarFile.java (original) +++ geronimo/server/branches/2.1/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/util/UnpackedJarFile.java Mon Dec 15 06:31:04 2008 @@ -115,7 +115,7 @@ } if (file == null) { - throw new IOException("Entry not found: name=" + file.getAbsolutePath()); + throw new IOException("Entry not found: name=" + zipEntry.getName()); } else if (file.isDirectory()) { return new DeploymentUtil.EmptyInputStream(); }