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 2014/11/20 12:38:53 UTC
tomee git commit: typo in matching of deployments.xml
Repository: tomee
Updated Branches:
refs/heads/develop b31e61b3c -> eb13cfaa3
typo in matching of deployments.xml
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/eb13cfaa
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/eb13cfaa
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/eb13cfaa
Branch: refs/heads/develop
Commit: eb13cfaa3a8c5fc1f72a8d41d756adb0076ec643
Parents: b31e61b
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Thu Nov 20 12:38:35 2014 +0100
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Thu Nov 20 12:38:35 2014 +0100
----------------------------------------------------------------------
.../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/eb13cfaa/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 2939214..dbcc2c0 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
@@ -350,9 +350,12 @@ public class DeployerEjb implements Deployer {
break;
} else { // exploded dirs
final String jar = deps.getFile();
- if (jar != null && jar.length() > 3 && jar.substring(0, jar.length() - 4).equals(deps.getDir())) {
- it.remove();
- break;
+ if (jar != null && jar.length() > 3) {
+ final String substring = jar.substring(0, jar.length() - 4);
+ if (substring.equals(current.getDir()) || substring.equals(current.getFile())) {
+ it.remove();
+ break;
+ }
}
}
}