geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jb...@apache.org
Subject svn commit: r726699 - in /geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/util: NestedJarFile.java UnpackedJarFile.java
Date Mon, 15 Dec 2008 14:30:36 GMT
Author: jbohn
Date: Mon Dec 15 06:30:36 2008
New Revision: 726699

URL: http://svn.apache.org/viewvc?rev=726699&view=rev
Log:
GERONIMO-4467 Fix NPE - patch by Shawn Jiang - thanks

Modified:
    geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/util/NestedJarFile.java
    geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/util/UnpackedJarFile.java

Modified: geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/util/NestedJarFile.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/util/NestedJarFile.java?rev=726699&r1=726698&r2=726699&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/util/NestedJarFile.java
(original)
+++ geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/util/NestedJarFile.java
Mon Dec 15 06:30:36 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/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/util/UnpackedJarFile.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/util/UnpackedJarFile.java?rev=726699&r1=726698&r2=726699&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/util/UnpackedJarFile.java
(original)
+++ geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/util/UnpackedJarFile.java
Mon Dec 15 06:30:36 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();
         }



Mime
View raw message