svn commit: r1433334 - /tomee/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java

[rmannibucau]

Author: rmannibucau
Date: Tue Jan 15 10:04:22 2013
New Revision: 1433334

URL: http://svn.apache.org/viewvc?rev=1433334&view=rev
Log:
TOMEE-735 deploy or not current ejbjar for ear deployment algorithm rewrite 
since now we have the info if the ejbjar is a webapp or not

Modified:
    
tomee/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java

Modified: 
tomee/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
URL: 
http://svn.apache.org/viewvc/tomee/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java?rev=1433334&r1=1433333&r2=1433334&view=diff
==============================================================================
--- 
tomee/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
 (original)
+++ 
tomee/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
 Tue Jan 15 10:04:22 2013
@@ -843,13 +843,13 @@ public class Assembler extends Assembler
         for (final EjbJarInfo ejbJar : appInfo.ejbJars) {
             boolean skip = false;
             if (!appInfo.webAppAlone) {
-                for (final WebAppInfo webapp : appInfo.webApps) {
-                    if ((webappId == null && 
ejbJar.moduleId.equals(webapp.moduleId))
-                            || (webappId != null && 
!ejbJar.moduleId.equals(webappId))) {
-                        skip = true;
-                    }
+                if (webappId == null) {
+                    skip = ejbJar.webapp; // we look for the lib part of the 
ear so deploy only if not a webapp
+                } else if (!ejbJar.webapp || 
!ejbJar.moduleId.equals(webappId)) {
+                    skip = true; // we look for a particular webapp deployment 
so deploy only if this webapp
                 }
             }
+
             if (skip) {
                 continue;
             }