Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 48097 invoked from network); 25 Jan 2008 07:25:38 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 25 Jan 2008 07:25:38 -0000 Received: (qmail 10354 invoked by uid 500); 25 Jan 2008 07:25:28 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 10346 invoked by uid 500); 25 Jan 2008 07:25:28 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 10335 invoked by uid 99); 25 Jan 2008 07:25:28 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 24 Jan 2008 23:25:28 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 25 Jan 2008 07:25:22 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 50FD21A9832; Thu, 24 Jan 2008 23:25:10 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: scm@geronimo.apache.org From: vamsic007@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080125072510.50FD21A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 {