Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 55973 invoked from network); 18 May 2006 01:20:08 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 18 May 2006 01:20:08 -0000 Received: (qmail 78083 invoked by uid 500); 18 May 2006 01:20:08 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 78052 invoked by uid 500); 18 May 2006 01:20:07 -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 78041 invoked by uid 99); 18 May 2006 01:20:07 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 May 2006 18:20:07 -0700 X-ASF-Spam-Status: No, hits=0.6 required=10.0 tests=NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 May 2006 18:20:07 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 23A1C1A9835; Wed, 17 May 2006 18:19:47 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r407425 - /geronimo/branches/1.1/modules/deploy-tool/src/java/org/apache/geronimo/deployment/PluginBootstrap.java Date: Thu, 18 May 2006 01:19:46 -0000 To: scm@geronimo.apache.org From: jsisson@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060518011947.23A1C1A9835@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: jsisson Date: Wed May 17 18:19:46 2006 New Revision: 407425 URL: http://svn.apache.org/viewvc?rev=407425&view=rev Log: GERONIMO-2034 [deployment] ensure output streams are closed in finally blocks Modified: geronimo/branches/1.1/modules/deploy-tool/src/java/org/apache/geronimo/deployment/PluginBootstrap.java Modified: geronimo/branches/1.1/modules/deploy-tool/src/java/org/apache/geronimo/deployment/PluginBootstrap.java URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/deploy-tool/src/java/org/apache/geronimo/deployment/PluginBootstrap.java?rev=407425&r1=407424&r2=407425&view=diff ============================================================================== --- geronimo/branches/1.1/modules/deploy-tool/src/java/org/apache/geronimo/deployment/PluginBootstrap.java (original) +++ geronimo/branches/1.1/modules/deploy-tool/src/java/org/apache/geronimo/deployment/PluginBootstrap.java Wed May 17 18:19:46 2006 @@ -18,6 +18,7 @@ import java.io.File; import java.io.FileOutputStream; +import java.io.IOException; import java.util.Collections; import java.util.jar.JarOutputStream; @@ -80,13 +81,23 @@ ArtifactManager artifactManager = new DefaultArtifactManager(); ArtifactResolver artifactResolver = new DefaultArtifactResolver(artifactManager, Collections.singleton(repository), null); DeploymentContext context = builder.buildConfiguration(false, builder.getConfigurationID(config, null, new ModuleIDBuilder()), config, null, Collections.singleton(targetConfigurationStore), artifactResolver, targetConfigurationStore); - ConfigurationData configurationData = context.getConfigurationData(); - - JarOutputStream out = new JarOutputStream(new FileOutputStream(carFile)); - ExecutableConfigurationUtil.writeConfiguration(configurationData, out); - out.flush(); - out.close(); - - context.close(); + JarOutputStream out = null; + try { + ConfigurationData configurationData = context.getConfigurationData(); + out = new JarOutputStream(new FileOutputStream(carFile)); + ExecutableConfigurationUtil.writeConfiguration(configurationData, out); + out.flush(); + } finally { + if (out != null) + { + try { + out.close(); + } catch (IOException ignored) { + // ignored + } + } + if (context != null) + context.close(); + } } }