[seam-commits] Seam SVN: r12019 - in modules/remoting/trunk/src/main/java/org/jboss/seam/remoting: model and 1 other directory.

[seam-commits at lists.jboss.org]

Author: shane.bryzak at jboss.com
Date: 2010-02-09 01:48:55 -0500 (Tue, 09 Feb 2010)
New Revision: 12019

Modified:
   modules/remoting/trunk/src/main/java/org/jboss/seam/remoting/ExecutionHandler.java
   modules/remoting/trunk/src/main/java/org/jboss/seam/remoting/model/ModelHandler.java
Log:
fix compiler errors


Modified: modules/remoting/trunk/src/main/java/org/jboss/seam/remoting/ExecutionHandler.java
===================================================================
--- modules/remoting/trunk/src/main/java/org/jboss/seam/remoting/ExecutionHandler.java	2010-02-08 21:10:22 UTC (rev 12018)
+++ modules/remoting/trunk/src/main/java/org/jboss/seam/remoting/ExecutionHandler.java	2010-02-09 06:48:55 UTC (rev 12019)
@@ -6,6 +6,7 @@
 import java.io.StringReader;
 import java.util.Iterator;
 
+import javax.enterprise.context.ContextNotActiveException;
 import javax.enterprise.context.Conversation;
 import javax.enterprise.inject.spi.BeanManager;
 import javax.inject.Inject;
@@ -76,9 +77,16 @@
       // Extract the calls from the request
       Call call = unmarshalCall(env);
       call.execute();
-
+      
       // Store the conversation ID in the outgoing context
-      ctx.setConversationId(conversation.getId());
+      try
+      {
+         ctx.setConversationId(conversation.getId());
+      }
+      catch (ContextNotActiveException ex)
+      {
+         // No active conversation context, ignore
+      }
 
       // Package up the response
       marshalResponse(call, ctx, response.getOutputStream());

Modified: modules/remoting/trunk/src/main/java/org/jboss/seam/remoting/model/ModelHandler.java
===================================================================
--- modules/remoting/trunk/src/main/java/org/jboss/seam/remoting/model/ModelHandler.java	2010-02-08 21:10:22 UTC (rev 12018)
+++ modules/remoting/trunk/src/main/java/org/jboss/seam/remoting/model/ModelHandler.java	2010-02-09 06:48:55 UTC (rev 12019)
@@ -83,13 +83,15 @@
          
          if (ctx.getConversationId() != null && !ctx.getConversationId().isEmpty())
          { 
-            conversationContext.setBeanStore(new ConversationBeanStore(request.getSession(), ctx.getConversationId()));
+            conversationContext.setBeanStore(new ConversationBeanStore(
+                  request.getSession(), false, ctx.getConversationId()));
             conversationContext.setActive(true);  
             conversationManager.beginOrRestoreConversation(ctx.getConversationId());
          }
          else
          {
-            conversationContext.setBeanStore(new ConversationBeanStore(request.getSession(), 
+            conversationContext.setBeanStore(new ConversationBeanStore(
+                  request.getSession(), false,  
                   ((org.jboss.weld.conversation.ConversationImpl) conversation).getUnderlyingId()));
             conversationContext.setActive(true);
          }