You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sl...@apache.org on 2007/07/19 12:23:09 UTC

svn commit: r557558 - /incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/AbstractInvocationHandler.java

Author: slaws
Date: Thu Jul 19 03:23:08 2007
New Revision: 557558

URL: http://svn.apache.org/viewvc?view=rev&rev=557558
Log:
TUSCANY-1377
Store the conversationId locally rather than getting it from the thread context. As it stands the code relies on the client being conversational as well as the service. 

Modified:
    incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/AbstractInvocationHandler.java

Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/AbstractInvocationHandler.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/AbstractInvocationHandler.java?view=diff&rev=557558&r1=557557&r2=557558
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/AbstractInvocationHandler.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/AbstractInvocationHandler.java Thu Jul 19 03:23:08 2007
@@ -38,6 +38,7 @@
 public abstract class AbstractInvocationHandler {
     protected boolean conversational;
     private boolean conversationStarted;
+    private String conversationId;
     private MessageFactory messageFactory;
 
     protected AbstractInvocationHandler(MessageFactory messageFactory, boolean conversational) {
@@ -50,11 +51,10 @@
         Message msgContext = ThreadMessageContext.getMessageContext();
         Message msg = messageFactory.createMessage();
         if (conversational) {
-            String id = msgContext.getConversationID();
-            if (id == null) {
-                id = createConversationID();
+            if (conversationStarted == false) {
+                conversationId = createConversationID();
             }
-            msg.setConversationID(id);
+            msg.setConversationID(conversationId);
         }
 
         Invoker headInvoker = chain.getHeadInvoker();



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org