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 2016/08/09 15:28:49 UTC
tomee git commit: TOMEE-1898 avoid NPE when pojo webservices are used
without cdi
Repository: tomee
Updated Branches:
refs/heads/master ad5a363d3 -> a331811ec
TOMEE-1898 avoid NPE when pojo webservices are used without cdi
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/a331811e
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/a331811e
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/a331811e
Branch: refs/heads/master
Commit: a331811ec3f6865a0bc7b341c8f5f514870fcc50
Parents: ad5a363
Author: Romain manni-Bucau <rm...@gmail.com>
Authored: Tue Aug 9 17:26:58 2016 +0200
Committer: Romain manni-Bucau <rm...@gmail.com>
Committed: Tue Aug 9 17:26:58 2016 +0200
----------------------------------------------------------------------
.../main/java/org/apache/openejb/server/cxf/pojo/PojoEndpoint.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/a331811e/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 229a474..97021a3 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
@@ -107,7 +107,7 @@ public class PojoEndpoint extends CxfEndpoint {
Thread.currentThread().setContextClassLoader(loader);
try {
final WebBeansContext webBeansContext = WebBeansContext.currentInstance();
- final BeanManagerImpl bm = webBeansContext.getBeanManagerImpl();
+ final BeanManagerImpl bm = webBeansContext == null ? null : webBeansContext.getBeanManagerImpl();
if (bm != null && bm.isInUse()) { // try cdi bean
if (JAXWS_AS_CDI_BEANS) {
try {