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 2012/12/19 00:19:00 UTC
svn commit: r1423713 -
/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
Author: rmannibucau
Date: Tue Dec 18 23:18:59 2012
New Revision: 1423713
URL: http://svn.apache.org/viewvc?rev=1423713&view=rev
Log:
better management of skip test for ejb deployment
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java?rev=1423713&r1=1423712&r2=1423713&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java Tue Dec 18 23:18:59 2012
@@ -829,10 +829,12 @@ public class Assembler extends Assembler
final EjbJarBuilder ejbJarBuilder = new EjbJarBuilder(props, appContext);
for (final EjbJarInfo ejbJar : appInfo.ejbJars) {
boolean skip = false;
- for (WebAppInfo webapp : appInfo.webApps) {
- if ((webappId == null && ejbJar.moduleId.equals(webapp.moduleId))
- || (webappId != null && !ejbJar.moduleId.equals(webappId))) {
- skip = true;
+ if (!appInfo.webAppAlone) {
+ for (WebAppInfo webapp : appInfo.webApps) {
+ if ((webappId == null && ejbJar.moduleId.equals(webapp.moduleId))
+ || (webappId != null && !ejbJar.moduleId.equals(webappId))) {
+ skip = true;
+ }
}
}
if (skip) {