[weld-commits] Weld SVN: r5746 - wicket/trunk/src/main/java/org/jboss/weld/wicket.

[weld-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2010-02-04 15:54:10 -0500 (Thu, 04 Feb 2010)
New Revision: 5746

Modified:
   wicket/trunk/src/main/java/org/jboss/weld/wicket/WeldRequestCycle.java
Log:
account for soime changes in core

Modified: wicket/trunk/src/main/java/org/jboss/weld/wicket/WeldRequestCycle.java
===================================================================
--- wicket/trunk/src/main/java/org/jboss/weld/wicket/WeldRequestCycle.java	2010-02-04 19:37:19 UTC (rev 5745)
+++ wicket/trunk/src/main/java/org/jboss/weld/wicket/WeldRequestCycle.java	2010-02-04 20:54:10 UTC (rev 5746)
@@ -91,6 +91,16 @@
          getInstanceByType(manager, ConversationManager.class).beginOrRestoreConversation(specifiedCid);
       }
 
+
+      ConversationContext conversationContext = Container.instance().services().get(ContextLifecycle.class).getConversationContext();
+      // Now set up the conversational context if it isn't already
+      if (!conversationContext.isActive())
+      {
+         // TODO account for invalidated session
+         conversationContext.setBeanStore(new ConversationBeanStore(((WebRequest) request).getHttpServletRequest().getSession(), false, conversation.getUnderlyingId()));
+         conversationContext.setActive(true);
+      }
+
       // handle propagation of existing long running converstaions to new
       // targets
       if (!conversation.isTransient())
@@ -116,13 +126,7 @@
          }
       }
 
-      ConversationContext conversationContext = Container.instance().services().get(ContextLifecycle.class).getConversationContext();
-      // Now set up the conversational context if it isn't already
-      if (!conversationContext.isActive())
-      {
-         conversationContext.setBeanStore(new ConversationBeanStore(((WebRequest) request).getHttpServletRequest().getSession(), conversation.getUnderlyingId()));
-         conversationContext.setActive(true);
-      }
+
    }
 
    @SuppressWarnings("unchecked")