You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by va...@apache.org on 2008/02/01 22:09:17 UTC
svn commit: r617648 - in /geronimo/server:
branches/2.0/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/
trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/
Author: vamsic007
Date: Fri Feb 1 13:09:16 2008
New Revision: 617648
URL: http://svn.apache.org/viewvc?rev=617648&view=rev
Log:
GERONIMO-3764 DeployerReaper fails to cleanup the temp directories left behind by deployer
o EARConfigBuilder should close modules when deployment fails due to already existing configuration. Otherwise deployer leaves temp files behind.
Modified:
geronimo/server/branches/2.0/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
Modified: geronimo/server/branches/2.0/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java?rev=617648&r1=617647&r2=617648&view=diff
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java (original)
+++ geronimo/server/branches/2.0/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java Fri Feb 1 13:09:16 2008
@@ -495,18 +495,19 @@
EARContext earContext = null;
ConfigurationModuleType applicationType = applicationInfo.getType();
applicationInfo.getEnvironment().setConfigId(configId);
- File configurationDir;
+ File configurationDir = null;
try {
- configurationDir = targetConfigurationStore.createNewConfigurationDir(configId);
- } catch (ConfigurationAlreadyExistsException e) {
- throw new DeploymentException(e);
- }
+ try {
+ configurationDir = targetConfigurationStore.createNewConfigurationDir(configId);
+ } catch (ConfigurationAlreadyExistsException e) {
+ throw new DeploymentException(e);
+ }
+
+ ConfigurationManager configurationManager = this.configurationManager;
+ if (configurationManager == null) {
+ configurationManager = new SimpleConfigurationManager(configurationStores, artifactResolver, repositories);
+ }
- ConfigurationManager configurationManager = this.configurationManager;
- if (configurationManager == null) {
- configurationManager = new SimpleConfigurationManager(configurationStores, artifactResolver, repositories);
- }
- try {
// Create the output ear context
earContext = new EARContext(configurationDir,
inPlaceDeployment ? DeploymentUtil.toFile(earFile) : null,
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java?rev=617648&r1=617647&r2=617648&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java Fri Feb 1 13:09:16 2008
@@ -513,18 +513,19 @@
EARContext earContext = null;
ConfigurationModuleType applicationType = applicationInfo.getType();
applicationInfo.getEnvironment().setConfigId(configId);
- File configurationDir;
+ File configurationDir = null;
try {
- configurationDir = targetConfigurationStore.createNewConfigurationDir(configId);
- } catch (ConfigurationAlreadyExistsException e) {
- throw new DeploymentException(e);
- }
+ try {
+ configurationDir = targetConfigurationStore.createNewConfigurationDir(configId);
+ } catch (ConfigurationAlreadyExistsException e) {
+ throw new DeploymentException(e);
+ }
+
+ ConfigurationManager configurationManager = this.configurationManager;
+ if (configurationManager == null) {
+ configurationManager = new SimpleConfigurationManager(configurationStores, artifactResolver, repositories);
+ }
- ConfigurationManager configurationManager = this.configurationManager;
- if (configurationManager == null) {
- configurationManager = new SimpleConfigurationManager(configurationStores, artifactResolver, repositories);
- }
- try {
// Create the output ear context
earContext = new EARContext(configurationDir,
inPlaceDeployment ? DeploymentUtil.toFile(earFile) : null,