You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@myfaces.apache.org by gp...@apache.org on 2014/03/24 13:02:21 UTC

svn commit: r1580819 - /myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/ConversationContextAdapter.java

Author: gpetracek
Date: Mon Mar 24 12:02:20 2014
New Revision: 1580819

URL: http://svn.apache.org/r1580819
Log:
EXTCDI-315 improved compatibility

Modified:
    myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/ConversationContextAdapter.java

Modified: myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/ConversationContextAdapter.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/ConversationContextAdapter.java?rev=1580819&r1=1580818&r2=1580819&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/ConversationContextAdapter.java (original)
+++ myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/ConversationContextAdapter.java Mon Mar 24 12:02:20 2014
@@ -73,6 +73,11 @@ public class ConversationContextAdapter 
      */
     public <T> T get(Contextual<T> component, CreationalContext<T> creationalContext)
     {
+        if (creationalContext == null)
+        {
+            return null;
+        }
+
         if (component instanceof PassivationCapable && !(component instanceof Bean))
         {
             component = (Contextual<T>) BeanManagerProvider.getInstance().getBeanManager()