You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2016/08/19 13:00:46 UTC
tomee git commit: Meging zeppelin's PR to ensure we remove from
deployments.xml undeployed apps
Repository: tomee
Updated Branches:
refs/heads/master 2aeae2be3 -> d94404e00
Meging zeppelin's PR to ensure we remove from deployments.xml undeployed apps
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/d94404e0
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/d94404e0
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/d94404e0
Branch: refs/heads/master
Commit: d94404e00983aa1383316c5702c5b5f34847751b
Parents: 2aeae2b
Author: Romain manni-Bucau <rm...@gmail.com>
Authored: Fri Aug 19 15:00:30 2016 +0200
Committer: Romain manni-Bucau <rm...@gmail.com>
Committed: Fri Aug 19 15:00:30 2016 +0200
----------------------------------------------------------------------
.../main/java/org/apache/openejb/assembler/DeployerEjb.java | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/d94404e0/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java
index b951aac..1825095 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java
@@ -417,9 +417,12 @@ public class DeployerEjb implements Deployer {
}
}
if (appInfo != null) {
- assembler.destroyApplication(appInfo);
- if (appInfo.properties.containsKey("save-deployment")) {
- saveDeployment(new File(moduleId), false);
+ try {
+ assembler.destroyApplication(appInfo);
+ } finally {
+ if (appInfo.properties.containsKey("save-deployment")) {
+ saveDeployment(new File(moduleId), false);
+ }
}
} else {
throw new NoSuchApplicationException(moduleId);