svn commit: r1677791 - /openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContextsService.java

[struberg]

Author: struberg
Date: Tue May  5 12:02:43 2015
New Revision: 1677791

URL: http://svn.apache.org/r1677791
Log:
OWB-1050 only clean up conversations if the SessionContext is active

This can happen if the container blurps up its invalidation events

Modified:
    
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContextsService.java

Modified: 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContextsService.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContextsService.java?rev=1677791&r1=1677790&r2=1677791&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContextsService.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContextsService.java
 Tue May  5 12:02:43 2015
@@ -133,7 +133,7 @@ public abstract class AbstractContextsSe
     public void destroyOutdatedConversations(ConversationContext 
currentConversationContext)
     {
         Context sessionContext = getCurrentContext(SessionScoped.class, false);
-        if (sessionContext != null)
+        if (sessionContext != null && sessionContext.isActive())
         {
             ConversationManager conversationManager = 
webBeansContext.getConversationManager();
             Set<ConversationContext> conversationContexts = 
conversationManager.getSessionConversations(sessionContext, false);