Author: shane.bryzak(a)jboss.com Date: 2008-08-14 21:17:43 -0400 (Thu, 14 Aug 2008) New Revision: 8690 Modified: trunk/src/wicket/org/jboss/seam/wicket/SeamWebApplication.java Log: JBSEAM-2992 Propagate temporary conversation across redirect Modified: trunk/src/wicket/org/jboss/seam/wicket/SeamWebApplication.java =================================================================== --- trunk/src/wicket/org/jboss/seam/wicket/SeamWebApplication.java 2008-08-14 12:38:03 UTC (rev 8689) +++ trunk/src/wicket/org/jboss/seam/wicket/SeamWebApplication.java 2008-08-15 01:17:43 UTC (rev 8690) @@ -1,5 +1,6 @@ package org.jboss.seam.wicket; +import org.apache.wicket.IRedirectListener; import org.apache.wicket.Request; import org.apache.wicket.RequestCycle; import org.apache.wicket.Response; @@ -83,6 +84,18 @@ stringBuilder.append("&" + Manager.instance().getConversationIdParameter() + "=" + Conversation.instance().getId()); url = stringBuilder.subSequence(0, stringBuilder.length()); } + else if ( IRedirectListener.INTERFACE.getName().equals(name) ) + { + if (!Manager.instance().isLongRunningConversation()) + { + Manager.instance().beforeRedirect(); + } + + StringBuilder stringBuilder = new StringBuilder(url); + stringBuilder.append("&" + Manager.instance().getConversationIdParameter() + "=" + Conversation.instance().getId()); + url = stringBuilder.subSequence(0, stringBuilder.length()); + } + return url; } @@ -97,7 +110,6 @@ } return stringBuilder.subSequence(0, stringBuilder.length()); } - }; } };