Repository: tomee Updated Branches: refs/heads/master 02aecf19d -> b1646d20d
we need to take into account no bda urls as well to guess if we need to start or not cdi Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/b1646d20 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/b1646d20 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/b1646d20 Branch: refs/heads/master Commit: b1646d20dfcf093b93756564042f5a50e5f22425 Parents: 02aecf1 Author: Romain Manni-Bucau <rmannibu...@apache.org> Authored: Tue Jun 16 11:52:55 2015 +0200 Committer: Romain Manni-Bucau <rmannibu...@apache.org> Committed: Tue Jun 16 11:52:55 2015 +0200 ---------------------------------------------------------------------- .../openejb/arquillian/tests/jaxrs/suspended/SuspendedTest.java | 3 ++- .../java/org/apache/openejb/assembler/classic/Assembler.java | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/b1646d20/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/suspended/SuspendedTest.java ---------------------------------------------------------------------- diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/suspended/SuspendedTest.java b/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/suspended/SuspendedTest.java index 3d8741c..24b432e 100644 --- a/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/suspended/SuspendedTest.java +++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/suspended/SuspendedTest.java @@ -39,7 +39,8 @@ import static org.junit.Assert.assertEquals; public class SuspendedTest { @Deployment(testable = false) public static Archive<?> war() { - return ShrinkWrap.create(WebArchive.class, "suspended.war").addClasses(Endpoint.class, Endpoint.RunThread.class); + return ShrinkWrap.create(WebArchive.class, "suspended.war") + .addClasses(Endpoint.class, Endpoint.RunThread.class); } @ArquillianResource http://git-wip-us.apache.org/repos/asf/tomee/blob/b1646d20/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java index be712b4..b5947fe 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java @@ -1023,8 +1023,9 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A if (!"true".equalsIgnoreCase(appInfo.properties.getProperty("openejb.cdi.activated", "true"))) { return false; } - for (final EjbJarInfo ejbJarInfo : appInfo.ejbJars) { - if (ejbJarInfo.beans != null && !ejbJarInfo.beans.bdas.isEmpty()) { + for (final EjbJarInfo ejbJarInfo : appInfo.ejbJars) { // pretty trivial heuristic but fine for 99% of cases + if (ejbJarInfo.beans != null + && (!ejbJarInfo.beans.bdas.isEmpty() || !ejbJarInfo.beans.noDescriptorBdas.isEmpty())) { return true; } }
