geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vamsic...@apache.org
Subject svn commit: r615417 - in /geronimo/server: branches/2.0/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/util/ trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/util/
Date Sat, 26 Jan 2008 00:55:27 GMT
Author: vamsic007
Date: Fri Jan 25 16:55:27 2008
New Revision: 615417

URL: http://svn.apache.org/viewvc?rev=615417&view=rev
Log:
GERONIMO-3764 Deployer fails to cleanup the temp files created during deployment process
 o NestedJarFile should close the baseJar only if it is created by itself.
 o This is sort of correcting the previous rev 615389 which may close the parent jar in one
case (I doubt if we will be hitting that instance in Geronimo, but just to keep things straight...)

Modified:
    geronimo/server/branches/2.0/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/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=615417&r1=615416&r2=615417&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
Fri Jan 25 16:55:27 2008
@@ -231,7 +231,8 @@
                 super.close();
             } catch(IOException ignored) {
             }
-            if (baseJar != null) {
+            if (baseJar != null && basePath.length() == 0) {
+                // baseJar is created by us.  We should be closing it too.
                 baseJar.close();
             }
         } finally {

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=615417&r1=615416&r2=615417&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
Fri Jan 25 16:55:27 2008
@@ -231,7 +231,8 @@
                 super.close();
             } catch(IOException ignored) {
             }
-            if (baseJar != null) {
+            if (baseJar != null && basePath.length() == 0) {
+                // baseJar is created by us.  We should be closing it too.
                 baseJar.close();
             }
         } finally {



Mime
View raw message