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 2015/01/29 13:32:28 UTC
tomee git commit: TOMEE-1504 better cleanup of Deployments using
DeployerEjb
Repository: tomee
Updated Branches:
refs/heads/tomee-1.7.x caa16e9f3 -> cedcc4782
TOMEE-1504 better cleanup of Deployments using DeployerEjb
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/cedcc478
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/cedcc478
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/cedcc478
Branch: refs/heads/tomee-1.7.x
Commit: cedcc47820ded88fcad45d32e89ba92c98d090ec
Parents: caa16e9
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Thu Jan 29 13:31:47 2015 +0100
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Thu Jan 29 13:32:18 2015 +0100
----------------------------------------------------------------------
.../main/java/org/apache/openejb/assembler/DeployerEjb.java | 9 +++++++++
1 file changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/cedcc478/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 162b5b2..bee0f36 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
@@ -357,6 +357,15 @@ public class DeployerEjb implements Deployer {
it.remove();
break;
}
+ } else {
+ final String jarC = current.getFile();
+ if (jarC != null && jarC.length() > 3) {
+ final String substring = jarC.substring(0, jarC.length() - 4);
+ if (substring.equals(deps.getDir()) || substring.equals(deps.getFile())) {
+ it.remove();
+ break;
+ }
+ }
}
}
}