svn commit: r1648292 - /openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationImpl.java

[rmannibucau]

Author: rmannibucau
Date: Mon Dec 29 07:43:33 2014
New Revision: 1648292

URL: http://svn.apache.org/r1648292
Log:
sometimes we just cant create the conversation scope

Modified:
    
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationImpl.java

Modified: 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationImpl.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationImpl.java?rev=1648292&r1=1648291&r2=1648292&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationImpl.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationImpl.java
 Mon Dec 29 07:43:33 2014
@@ -179,6 +179,10 @@ public class ConversationImpl implements
             
webBeansContext.getContextsService().startContext(ConversationScoped.class, 
null);
             context = (ConversationContext) 
webBeansContext.getContextsService().getCurrentContext(ConversationScoped.class);
         }
+        if (context == null)
+        {
+            throw new 
ContextNotActiveException(ConversationScoped.class.getName());
+        }
         if (!context.isActive())
         {
             context.setActive(true);