Repository: tomee Updated Branches: refs/heads/master c0e6d70f1 -> dbde8c552
TOMEE-1852 avoid NPE if cdi is not in use for jaxws Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/dbde8c55 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/dbde8c55 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/dbde8c55 Branch: refs/heads/master Commit: dbde8c552ba69fa4060ae8b340b64b1e74a7b0fe Parents: c0e6d70 Author: Romain manni-Bucau <rmannibu...@gmail.com> Authored: Sun Jun 26 19:48:26 2016 +0200 Committer: Romain manni-Bucau <rmannibu...@gmail.com> Committed: Sun Jun 26 19:48:26 2016 +0200 ---------------------------------------------------------------------- .../java/org/apache/openejb/server/cxf/pojo/PojoEndpoint.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/dbde8c55/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/pojo/PojoEndpoint.java ---------------------------------------------------------------------- diff --git a/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/pojo/PojoEndpoint.java b/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/pojo/PojoEndpoint.java index 8805ff9..229a474 100644 --- a/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/pojo/PojoEndpoint.java +++ b/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/pojo/PojoEndpoint.java @@ -108,7 +108,7 @@ public class PojoEndpoint extends CxfEndpoint { try { final WebBeansContext webBeansContext = WebBeansContext.currentInstance(); final BeanManagerImpl bm = webBeansContext.getBeanManagerImpl(); - if (bm.isInUse()) { // try cdi bean + if (bm != null && bm.isInUse()) { // try cdi bean if (JAXWS_AS_CDI_BEANS) { try { final Set<Bean<?>> beans = bm.getBeans(instance); @@ -152,7 +152,7 @@ public class PojoEndpoint extends CxfEndpoint { injectionProcessor.createInstance(); implementor = injectionProcessor.getInstance(); injector = injectCxfResources(implementor); - if (!JAXWS_AS_CDI_BEANS && bm.isInUse()) { + if (!JAXWS_AS_CDI_BEANS && bm != null && bm.isInUse()) { final CreationalContextImpl creationalContext = bm.createCreationalContext(null); OWBInjector.inject(bm, implementor, null); toClean = creationalContext;
