Updated Branches: refs/heads/wicket-6.x 6b64a85ca -> fccd0ffb4
Fixed last testcase: InitialContext.lookup can return null Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/fccd0ffb Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/fccd0ffb Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/fccd0ffb Branch: refs/heads/wicket-6.x Commit: fccd0ffb45385043ad2b20250d7645d4d4173346 Parents: 6b64a85 Author: Emond Papegaaij <[email protected]> Authored: Mon Nov 11 14:24:05 2013 +0100 Committer: Emond Papegaaij <[email protected]> Committed: Mon Nov 11 14:24:26 2013 +0100 ---------------------------------------------------------------------- .../src/main/java/org/apache/wicket/cdi/BeanManagerLookup.java | 6 ++++-- .../test/java/org/apache/wicket/cdi/CdiConfigurationTest.java | 1 - 2 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/fccd0ffb/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/BeanManagerLookup.java ---------------------------------------------------------------------- diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/BeanManagerLookup.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/BeanManagerLookup.java index 9220718..97b0550 100644 --- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/BeanManagerLookup.java +++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/BeanManagerLookup.java @@ -31,11 +31,13 @@ public final class BeanManagerLookup { try { - return InitialContext.doLookup("java:comp/BeanManager"); + BeanManager ret = InitialContext.doLookup("java:comp/BeanManager"); + if (ret != null) + return ret; } catch (NamingException e) { - return CDI.current().getBeanManager(); } + return CDI.current().getBeanManager(); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/fccd0ffb/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/CdiConfigurationTest.java ---------------------------------------------------------------------- diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/CdiConfigurationTest.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/CdiConfigurationTest.java index 7ac3be9..eb5ecc6 100644 --- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/CdiConfigurationTest.java +++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/CdiConfigurationTest.java @@ -139,7 +139,6 @@ public class CdiConfigurationTest extends WicketCdiTestCase * do not affect the application dependent global settings. */ @Test - @Ignore("The beanmanager cannot be resolved from a different thread") public void testMultiAppLoad() { getTester(); // Bring up app with name mockApp : the default
