geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vamsic...@apache.org
Subject svn commit: r615134 - 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 Fri, 25 Jan 2008 07:25:08 GMT
Author: vamsic007
Date: Thu Jan 24 23:24:59 2008
New Revision: 615134

URL: http://svn.apache.org/viewvc?rev=615134&view=rev
Log:
GERONIMO-3764 DeployerReaper fails to cleanup the temp directories left behind by deployer
 o NestedJarFile and UnpackedJarFile should call super.close() to release lock on DUMMY_JAR_FILE
used in constructor.

Modified:
    geronimo/server/branches/2.0/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/util/NestedJarFile.java
    geronimo/server/branches/2.0/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/util/UnpackedJarFile.java
    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/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=615134&r1=615133&r2=615134&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
Thu Jan 24 23:24:59 2008
@@ -227,6 +227,10 @@
         }
 
         try {
+            try {
+                super.close();
+            } catch(IOException ignored) {
+            }
             if (baseJar != null && isPacked()) {
                 baseJar.close();
             }

Modified: geronimo/server/branches/2.0/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/util/UnpackedJarFile.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/util/UnpackedJarFile.java?rev=615134&r1=615133&r2=615134&view=diff
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/util/UnpackedJarFile.java
(original)
+++ geronimo/server/branches/2.0/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/util/UnpackedJarFile.java
Thu Jan 24 23:24:59 2008
@@ -135,6 +135,10 @@
     }
 
     public void close() throws IOException {
+        try {
+            super.close();
+        } catch(IOException ignored) {
+        }
     }
 
     protected void finalize() throws IOException {

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=615134&r1=615133&r2=615134&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
Thu Jan 24 23:24:59 2008
@@ -227,6 +227,10 @@
         }
 
         try {
+            try {
+                super.close();
+            } catch(IOException ignored) {
+            }
             if (baseJar != null && isPacked()) {
                 baseJar.close();
             }

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=615134&r1=615133&r2=615134&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
Thu Jan 24 23:24:59 2008
@@ -135,6 +135,10 @@
     }
 
     public void close() throws IOException {
+        try {
+            super.close();
+        } catch(IOException ignored) {
+        }
     }
 
     protected void finalize() throws IOException {



Mime
View raw message