Unbreaking endRequest

weld · Apr 7, 2010 · 81825f5 · 81825f5
1 parent e286909
commit 81825f5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/impl/src/main/java/org/jboss/weld/context/ContextLifecycle.java b/impl/src/main/java/org/jboss/weld/context/ContextLifecycle.java
@@ -26,11 +26,11 @@
 import static org.jboss.weld.logging.LoggerFactory.loggerFactory;
 import static org.jboss.weld.logging.messages.ContextMessage.APPLICATION_ENDED;
 import static org.jboss.weld.logging.messages.ContextMessage.APPLICATION_STARTED;
+import static org.jboss.weld.logging.messages.ContextMessage.CONVERSATION_RESTORED;
 import static org.jboss.weld.logging.messages.ContextMessage.REQUEST_ENDED;
 import static org.jboss.weld.logging.messages.ContextMessage.REQUEST_STARTED;
 import static org.jboss.weld.logging.messages.ContextMessage.SESSION_ENDED;
 import static org.jboss.weld.logging.messages.ContextMessage.SESSION_RESTORED;
-import static org.jboss.weld.logging.messages.ContextMessage.CONVERSATION_RESTORED;
 
 import org.jboss.weld.bootstrap.api.Lifecycle;
 import org.jboss.weld.bootstrap.api.Service;
@@ -196,12 +196,13 @@ private void activateContext(AbstractThreadLocalMapContext context, BeanStore be
 
    private void activateConversationContext()
    {
-      activateContext(conversationContext, new ConcurrentHashMapBeanStore());
+      activateContext(conversationContext, new HashMapBeanStore());
    }
 
    private void activateSessionContext()
    {
-      activateContext(sessionContext, new ConcurrentHashMapBeanStore());
+//      activateContext(sessionContext, new HttpPassThruSessionBeanStore());
+      sessionContext.setActive(true);
    }
 
    public void endApplication()
@@ -270,7 +271,6 @@ public void deactivateSessionContext()
    public void endSession(String id, BeanStore sessionBeanStore)
    {
       log.trace(SESSION_ENDED, id);
-      destroyConversationContext();
       destroySessionContext(sessionBeanStore);
    }
 

diff --git a/impl/src/main/java/org/jboss/weld/servlet/ServletLifecycle.java b/impl/src/main/java/org/jboss/weld/servlet/ServletLifecycle.java
@@ -177,9 +177,9 @@ public void endRequest(HttpServletRequest request)
       {
          return;
       }
-      teardownRequest(request);
       teardownConversation();
       teardownSession(request);
+      teardownRequest(request);
    }
 
    private void teardownRequest(HttpServletRequest request)

diff --git a/tests/src/test/java/org/jboss/weld/tests/scope/ScopeTest.java b/tests/src/test/java/org/jboss/weld/tests/scope/ScopeTest.java
@@ -73,6 +73,7 @@ private void newRequest()
    {
       ContextLifecycle lifecycle = Container.instance().services().get(ContextLifecycle.class);
       lifecycle.endRequest("test", lifecycle.getRequestContext().getBeanStore());
+      lifecycle.restoreSession("test", new HashMapBeanStore());
       lifecycle.beginRequest("test", new HashMapBeanStore());
    }