WBRI-155

git-svn-id: http://anonsvn.jboss.org/repos/weld/ri/trunk@1797 1c488680-804c-0410-94cd-c6b725194a0e
weld · Mar 6, 2009 · 89e2201 · 89e2201
1 parent 2730d3d
commit 89e2201
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 6 deletions.
diff --git a/impl/src/main/java/org/jboss/webbeans/mock/MockLifecycle.java b/impl/src/main/java/org/jboss/webbeans/mock/MockLifecycle.java
@@ -99,7 +99,7 @@ public void endRequest()
 
    public void beginSession()
    {
-      super.beginSession("Mock", sessionBeanStore);
+      super.restoreSession("Mock", sessionBeanStore);
    }
 
    public void endSession()

diff --git a/impl/src/main/java/org/jboss/webbeans/servlet/AbstractLifecycle.java b/impl/src/main/java/org/jboss/webbeans/servlet/AbstractLifecycle.java
@@ -34,9 +34,9 @@ protected static void setInstance(AbstractLifecycle instance)
 
    private static LogProvider log = Logging.getLogProvider(AbstractLifecycle.class);
 
-   protected void beginSession(String id, BeanStore sessionBeanStore)
+   protected void restoreSession(String id, BeanStore sessionBeanStore)
    {
-      log.trace("Starting session " + id);
+      log.trace("Restoring session " + id);
       SessionContext.INSTANCE.setBeanStore(sessionBeanStore);
       SessionContext.INSTANCE.setActive(true);
    }

diff --git a/...bbeans/servlet/WebBeansServletFilter.java → ...ervlet/ConversationPropagationFilter.java b/...bbeans/servlet/WebBeansServletFilter.java → ...ervlet/ConversationPropagationFilter.java
@@ -39,7 +39,7 @@
  * @author Nicklas Karlsson
  * 
  */
-public class WebBeansServletFilter implements Filter
+public class ConversationPropagationFilter implements Filter
 {
 
    /**

diff --git a/impl/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java b/impl/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java
@@ -59,7 +59,6 @@ public static ServletLifecycle instance()
     */
    public void beginSession(HttpSession session)
    {
-      super.beginSession(session.getId(), null);
    }
 
    /**
@@ -85,7 +84,7 @@ public void endSession(HttpSession session)
    protected BeanStore restoreSessionContext(HttpSession session)
    {
       BeanStore sessionBeanStore = new HttpSessionBeanStore(session);
-      SessionContext.INSTANCE.setBeanStore(sessionBeanStore);
+      super.restoreSession(session.getId(), sessionBeanStore);
       CurrentManager.rootManager().getInstanceByType(HttpSessionManager.class).setSession(session);
       return sessionBeanStore;
    }

diff --git a/impl/src/test/java/org/jboss/webbeans/test/unit/context/ContextTest.java b/impl/src/test/java/org/jboss/webbeans/test/unit/context/ContextTest.java
@@ -0,0 +1,16 @@
+package org.jboss.webbeans.test.unit.context;
+
+import org.jboss.webbeans.test.unit.AbstractTest;
+import org.testng.annotations.Test;
+
+public class ContextTest extends AbstractTest
+{
+   // WBRI-155
+   @Test(groups="stub")
+   public void testSessionContextActiveForMultipleSimultaneousThreads()
+   {
+      assert false;
+      // TODO Implement this test
+   }
+
+}