You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by rm...@apache.org on 2014/12/26 22:27:40 UTC

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

Author: rmannibucau
Date: Fri Dec 26 21:27:40 2014
New Revision: 1648019

URL: http://svn.apache.org/r1648019
Log:
using OpenWebBeansWebPlugin.web.currentSessionId

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=1648019&r1=1648018&r2=1648019&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 Fri Dec 26 21:27:40 2014
@@ -35,6 +35,7 @@ import org.apache.webbeans.config.OpenWe
 import org.apache.webbeans.config.WebBeansContext;
 import org.apache.webbeans.context.ConversationContext;
 import org.apache.webbeans.logger.WebBeansLoggerFacade;
+import org.apache.webbeans.spi.plugins.OpenWebBeansWebPlugin;
 import org.apache.webbeans.util.Asserts;
 
 /**
@@ -183,7 +184,11 @@ public class ConversationImpl implements
             this.id = id;
             if (this.sessionId == null)
             {
-                this.sessionId = getSessionId();
+                OpenWebBeansWebPlugin web = webBeansContext.getPluginLoader().getWebPlugin();
+                if (web != null)
+                {
+                    this.sessionId = web.currentSessionId();
+                }
             }
             updateTimeOut();
             conversationManager.addConversationContext(this, (ConversationContext) webBeansContext.getBeanManagerImpl().getContext(ConversationScoped.class));