EXTCDI-304 improvement for openejb

git-svn-id: https://svn.apache.org/repos/asf/myfaces/extensions/cdi/trunk@1423273 13f79535-47bb-0310-9956-ffa450edef68
apache · Dec 18, 2012 · 7645eb2 · 7645eb2
1 parent 791def5
commit 7645eb2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/...pache/myfaces/extensions/cdi/core/impl/scope/conversation/ConversationContextAdapter.java b/...pache/myfaces/extensions/cdi/core/impl/scope/conversation/ConversationContextAdapter.java
@@ -93,6 +93,12 @@ public <T> T get(Contextual<T> component, CreationalContext<T> creationalContext
      */
     public <T> T get(Contextual<T> component)
     {
+        //workaround for openejb - see EXTCDI-304
+        if (component == null)
+        {
+            return null;
+        }
+
         if (component instanceof Bean)
         {
             return this.conversationContext.resolve((Bean<T>)component);

diff --git a/...c/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/view/ViewScopedContext.java b/...c/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/view/ViewScopedContext.java
@@ -56,6 +56,12 @@ public class ViewScopedContext implements Context, SystemEventListener
      */
     public <T> T get(Contextual<T> component)
     {
+        //workaround for openejb - see EXTCDI-304
+        if (component == null)
+        {
+            return null;
+        }
+
         checkActive();
 
         if(!isJsfSubscribed)