geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vamsic...@apache.org
Subject svn commit: r570817 - in /geronimo/server: branches/2.0/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/util/NestedJarFile.java trunk/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/util/NestedJarFile.java
Date Wed, 29 Aug 2007 14:12:19 GMT
Author: vamsic007
Date: Wed Aug 29 07:12:18 2007
New Revision: 570817

URL: http://svn.apache.org/viewvc?rev=570817&view=rev
Log:
GERONIMO-3208 In-place deployment fails when renaming file
  o Fixed the problem in NestedJarFile.
  o Thanks to Aman Nanner for providing the patch.
  o Verified that with the fix I am able to deploy an unpacked ear (similar to the one attached
to the JIRA by Aman) inPlace.

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

Modified: geronimo/server/branches/2.0/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/util/NestedJarFile.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/util/NestedJarFile.java?rev=570817&r1=570816&r2=570817&view=diff
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/util/NestedJarFile.java
(original)
+++ geronimo/server/branches/2.0/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/util/NestedJarFile.java
Wed Aug 29 07:12:18 2007
@@ -85,14 +85,18 @@
         if (isClosed) {
             throw new IllegalStateException("NestedJarFile is closed");
         }
-        return basePath.length() > 0;
+
+        return ( basePath.length() > 0 ) ||
+               ( ( baseJar != null ) && ( baseJar instanceof UnpackedJarFile ) );
     }
 
     public boolean isPacked() {
         if (isClosed) {
             throw new IllegalStateException("NestedJarFile is closed");
         }
-        return basePath.length() == 0;
+
+        return ( basePath.length() == 0 ) &&
+               ( ( baseJar == null ) || !( baseJar instanceof UnpackedJarFile ) );
     }
 
     public JarFile getBaseJar() {

Modified: geronimo/server/trunk/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/util/NestedJarFile.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/util/NestedJarFile.java?rev=570817&r1=570816&r2=570817&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/util/NestedJarFile.java
(original)
+++ geronimo/server/trunk/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/util/NestedJarFile.java
Wed Aug 29 07:12:18 2007
@@ -85,14 +85,18 @@
         if (isClosed) {
             throw new IllegalStateException("NestedJarFile is closed");
         }
-        return basePath.length() > 0;
+
+        return ( basePath.length() > 0 ) ||
+               ( ( baseJar != null ) && ( baseJar instanceof UnpackedJarFile ) );
     }
 
     public boolean isPacked() {
         if (isClosed) {
             throw new IllegalStateException("NestedJarFile is closed");
         }
-        return basePath.length() == 0;
+
+        return ( basePath.length() == 0 ) &&
+               ( ( baseJar == null ) || !( baseJar instanceof UnpackedJarFile ) );
     }
 
     public JarFile getBaseJar() {



Mime
View raw message