[seam-commits] Seam SVN: r10270 - trunk/src/wicket/org/jboss/seam/wicket.
Author: cpopetz
Date: 2009-04-01 20:15:41 -0400 (Wed, 01 Apr 2009)
New Revision: 10270
Modified:
trunk/src/wicket/org/jboss/seam/wicket/SeamWebApplication.java
Log:
JBSEAM-4062
Modified: trunk/src/wicket/org/jboss/seam/wicket/SeamWebApplication.java
===================================================================
--- trunk/src/wicket/org/jboss/seam/wicket/SeamWebApplication.java 2009-04-01 23:56:49 UTC
(rev 10269)
+++ trunk/src/wicket/org/jboss/seam/wicket/SeamWebApplication.java 2009-04-02 00:15:41 UTC
(rev 10270)
@@ -179,9 +179,20 @@
String cid = (String) page.getMetaData(CID);
if (cid != null)
{
- ConversationPropagation cp = ConversationPropagation.instance();
- cp.setConversationId(cid);
- Manager.instance().restoreConversation();
+ Manager manager = Manager.instance();
+ if (manager.isLongRunningConversation())
+ {
+ if (!cid.equals(manager.getCurrentConversationId()))
+ {
+ manager.switchConversation(cid);
+ }
+ }
+ else
+ {
+ ConversationPropagation cp = ConversationPropagation.instance();
+ cp.setConversationId(cid);
+ manager.restoreConversation();
+ }
}
}
}