moved conversation setup/teardown out of jsf phase listener into serv…

…let lifecycle (Nik says to blame me if this doesn't work ;)
weld · Apr 1, 2010 · bf10ceb · bf10ceb
1 parent 6942e60
commit bf10ceb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/impl/src/main/java/org/jboss/weld/jsf/WeldPhaseListener.java b/impl/src/main/java/org/jboss/weld/jsf/WeldPhaseListener.java
@@ -118,7 +118,7 @@ else if (phaseEvent.getFacesContext().getResponseComplete())
    private void beforeRestoreView(FacesContext facesContext)
    {
       log.trace(INITIATING_CONVERSATION, "Restore View");
-      initiateSessionAndConversation(facesContext);
+      //initiateSessionAndConversation(facesContext);
    }
 
    /**
@@ -127,7 +127,7 @@ private void beforeRestoreView(FacesContext facesContext)
    private void afterRenderResponse(FacesContext facesContext)
    {
       log.trace(CLEANING_UP_CONVERSATION, "Render Response", "response complete");
-      getConversationManager().teardownConversation();
+      //getConversationManager().teardownConversation();
    }
 
    /**
@@ -136,7 +136,7 @@ private void afterRenderResponse(FacesContext facesContext)
    private void afterResponseComplete(FacesContext facesContext, PhaseId phaseId)
    {
       log.trace(CLEANING_UP_CONVERSATION, phaseId, "the response has been marked complete");
-      getConversationManager().teardownConversation();
+      //getConversationManager().teardownConversation();
    }
 
    /**

diff --git a/impl/src/main/java/org/jboss/weld/servlet/ServletLifecycle.java b/impl/src/main/java/org/jboss/weld/servlet/ServletLifecycle.java
@@ -162,6 +162,7 @@ public void beginRequest(HttpServletRequest request)
          request.setAttribute(REQUEST_ATTRIBUTE_NAME, beanStore);
          lifecycle.beginRequest(request.getRequestURI(), beanStore);
          restoreSessionContext(request);
+         conversationManager(request.getSession().getServletContext()).setupConversation(request.getParameter("cid"));
       }
    }
 
@@ -176,10 +177,12 @@ public void endRequest(HttpServletRequest request)
       {
          return;
       }
-      teardownSession(request);
+
+      conversationManager(request.getSession().getServletContext()).teardownConversation();
       teardownRequest(request);
       lifecycle.getConversationContext().setBeanStore(null);
       lifecycle.getConversationContext().setActive(false);
+      teardownSession(request);
    }
 
    private void teardownSession(HttpServletRequest request)