You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jb...@apache.org on 2008/12/15 15:31:04 UTC
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
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();
}