svn commit: r1350401 - /openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java

[rmannibucau]

Author: rmannibucau
Date: Thu Jun 14 20:59:28 2012
New Revision: 1350401

URL: http://svn.apache.org/viewvc?rev=1350401&view=rev
Log:
removing from deployments.xml apps even if we exploded it

Modified:
    
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java

Modified: 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java?rev=1350401&r1=1350400&r2=1350401&view=diff
==============================================================================
--- 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java
 (original)
+++ 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java
 Thu Jun 14 20:59:28 2012
@@ -258,6 +258,12 @@ public class DeployerEjb implements Depl
                     } else if (deps.getJar() != null && 
deps.getJar().equals(current.getJar())) {
                         it.remove();
                         break;
+                    } else { // exploded dirs
+                        String jar = deps.getJar();
+                        if (jar != null && jar.length() > 3 && 
jar.substring(0, jar.length() - 4).equals(deps.getDir())) {
+                            it.remove();
+                            break;
+                        }
                     }
                 }
             }