On Fri, Apr 9, 2010 at 12:13 PM, Pete Muir
<pmuir@redhat.com> wrote:
Guys,
This doesn't seem in line with the spec to me, and I think we should revert it. What is the motivation for doing it?
Pete
Begin forwarded message:
> From: weld-commits@lists.jboss.org
> Date: 1 April 2010 07:48:18 GMT+01:00
> To: weld-commits@lists.jboss.org
> Subject: [weld-commits] Weld SVN: r6071 - in core/trunk/impl/src/main/java/org/jboss/weld: servlet and 1 other directory.
> Reply-To: weld-commits@lists.jboss.org
>
> Author: shane.bryzak@jboss.com
> Date: 2010-04-01 02:48:18 -0400 (Thu, 01 Apr 2010)
> New Revision: 6071
>
> Modified:
> core/trunk/impl/src/main/java/org/jboss/weld/jsf/WeldPhaseListener.java
> core/trunk/impl/src/main/java/org/jboss/weld/servlet/ServletLifecycle.java
> Log:
> moved conversation setup/teardown out of jsf phase listener into servlet lifecycle (Nik says to blame me if this doesn't work ;)
>
>
> Modified: core/trunk/impl/src/main/java/org/jboss/weld/jsf/WeldPhaseListener.java
> ===================================================================
> --- core/trunk/impl/src/main/java/org/jboss/weld/jsf/WeldPhaseListener.java 2010-03-31 03:21:16 UTC (rev 6070)
> +++ core/trunk/impl/src/main/java/org/jboss/weld/jsf/WeldPhaseListener.java 2010-04-01 06:48:18 UTC (rev 6071)
> @@ -118,7 +118,7 @@
> private void beforeRestoreView(FacesContext facesContext)
> {
> log.trace(INITIATING_CONVERSATION, "Restore View");
> - initiateSessionAndConversation(facesContext);
> + //initiateSessionAndConversation(facesContext);
> }
>
> /**
> @@ -127,7 +127,7 @@
> private void afterRenderResponse(FacesContext facesContext)
> {
> log.trace(CLEANING_UP_CONVERSATION, "Render Response", "response complete");
> - getConversationManager().teardownConversation();
> + //getConversationManager().teardownConversation();
> }
>
> /**
> @@ -136,7 +136,7 @@
> private void afterResponseComplete(FacesContext facesContext, PhaseId phaseId)
> {
> log.trace(CLEANING_UP_CONVERSATION, phaseId, "the response has been marked complete");
> - getConversationManager().teardownConversation();
> + //getConversationManager().teardownConversation();
> }
>
> /**
>
> Modified: core/trunk/impl/src/main/java/org/jboss/weld/servlet/ServletLifecycle.java
> ===================================================================
> --- core/trunk/impl/src/main/java/org/jboss/weld/servlet/ServletLifecycle.java 2010-03-31 03:21:16 UTC (rev 6070)
> +++ core/trunk/impl/src/main/java/org/jboss/weld/servlet/ServletLifecycle.java 2010-04-01 06:48:18 UTC (rev 6071)
> @@ -162,6 +162,7 @@
> 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 @@
> {
> 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)
>
> _______________________________________________
> weld-commits mailing list
> weld-commits@lists.jboss.org
> https://lists.jboss.org/mailman/listinfo/weld-commits
_______________________________________________
weld-dev mailing list
weld-dev@lists.jboss.org
https://lists.jboss.org/mailman/listinfo/weld-dev