tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmannibu...@apache.org
Subject tomee git commit: TOMEE-2037 avoid npe in Injector
Date Mon, 24 Apr 2017 13:15:24 GMT
Repository: tomee
Updated Branches:
  refs/heads/master 8fc8d8011 -> c714f50af


TOMEE-2037 avoid npe in Injector


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/c714f50a
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/c714f50a
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/c714f50a

Branch: refs/heads/master
Commit: c714f50af561c70803360cc44bd8ac737592e6cf
Parents: 8fc8d80
Author: rmannibucau <rmannibucau@apache.org>
Authored: Mon Apr 24 15:15:19 2017 +0200
Committer: rmannibucau <rmannibucau@apache.org>
Committed: Mon Apr 24 15:15:19 2017 +0200

----------------------------------------------------------------------
 .../openejb-core/src/main/java/org/apache/openejb/Injector.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/c714f50a/container/openejb-core/src/main/java/org/apache/openejb/Injector.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/Injector.java b/container/openejb-core/src/main/java/org/apache/openejb/Injector.java
index db44d9e..5817c24 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/Injector.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/Injector.java
@@ -64,7 +64,7 @@ public class Injector {
     }
 
     private static <T> void cdiInjections(final BeanContext context, final T object)
{
-        if (context.getWebBeansContext() == null) {
+        if (context == null || context.getWebBeansContext() == null) {
             return;
         }
 


Mime
View raw message