Repository: tomee Updated Branches: refs/heads/master b1646d20d -> fe385b80e
one more npe check Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/fe385b80 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/fe385b80 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/fe385b80 Branch: refs/heads/master Commit: fe385b80e555e7fb71cdb2a3d035a788555e81a8 Parents: b1646d2 Author: Romain Manni-Bucau <rmannibu...@apache.org> Authored: Tue Jun 16 12:03:43 2015 +0200 Committer: Romain Manni-Bucau <rmannibu...@apache.org> Committed: Tue Jun 16 12:03:43 2015 +0200 ---------------------------------------------------------------------- .../apache/tomee/arquillian/remote/RemoteTomEEObserver.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/fe385b80/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEObserver.java ---------------------------------------------------------------------- diff --git a/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEObserver.java b/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEObserver.java index 4687b47..3aec416 100644 --- a/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEObserver.java +++ b/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEObserver.java @@ -18,6 +18,7 @@ package org.apache.tomee.arquillian.remote; import org.apache.openejb.cdi.ThreadSingletonServiceImpl; +import org.apache.webbeans.config.WebBeansContext; import org.jboss.arquillian.core.api.InstanceProducer; import org.jboss.arquillian.core.api.annotation.Inject; import org.jboss.arquillian.core.api.annotation.Observes; @@ -39,7 +40,10 @@ public class RemoteTomEEObserver { private InstanceProducer<Context> context; public void beforeSuite(@Observes final BeforeSuite event) { - beanManager.set(ThreadSingletonServiceImpl.get(Thread.currentThread().getContextClassLoader()).getBeanManagerImpl()); + final WebBeansContext webBeansContext = ThreadSingletonServiceImpl.get(Thread.currentThread().getContextClassLoader()); + if (webBeansContext != null) { + beanManager.set(webBeansContext.getBeanManagerImpl()); + } try { context.set(new InitialContext()); } catch (final NamingException e) {
