summaryrefslogtreecommitdiffstats
path: root/sca-java-2.x/trunk/modules/core/src
diff options
context:
space:
mode:
authorfmoga <fmoga@13f79535-47bb-0310-9956-ffa450edef68>2011-02-11 20:47:26 +0000
committerfmoga <fmoga@13f79535-47bb-0310-9956-ffa450edef68>2011-02-11 20:47:26 +0000
commit607b4165105d6c918164b7d8e3f430af7737ce95 (patch)
tree89d910a746d96c29d0b71837b4b7d6c8d509a5b6 /sca-java-2.x/trunk/modules/core/src
parent5f6f915b67998984955846e5c752e0ebfeeb1054 (diff)
Correct core modification.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1069951 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x/trunk/modules/core/src')
-rw-r--r--sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKCallbackInvocationHandler.java5
-rw-r--r--sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKInvocationHandler.java5
2 files changed, 5 insertions, 5 deletions
diff --git a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKCallbackInvocationHandler.java b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKCallbackInvocationHandler.java
index 9b51aefe39..0acfdddec7 100644
--- a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKCallbackInvocationHandler.java
+++ b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKCallbackInvocationHandler.java
@@ -114,6 +114,11 @@ public class JDKCallbackInvocationHandler extends JDKInvocationHandler {
// Deal with header information that needs to be copied from the message context to the new message...
transferMessageHeaders( msg, msgContext);
+ // Preserve binding context
+ if (msgContext != null) {
+ msg.setBindingContext(msgContext.getBindingContext());
+ }
+
ThreadMessageContext.setMessageContext(msg);
// If there is a supplied message ID, place its value into the Message Header under "RELATES_TO"
diff --git a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKInvocationHandler.java b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKInvocationHandler.java
index a19508c218..5bb2354520 100644
--- a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKInvocationHandler.java
+++ b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKInvocationHandler.java
@@ -310,11 +310,6 @@ public class JDKInvocationHandler implements InvocationHandler, Serializable {
// Deal with header information that needs to be copied from the message context to the new message...
transferMessageHeaders( msg, msgContext);
- // Preserve binding context
- if (msgContext != null) {
- msg.setBindingContext(msgContext.getBindingContext());
- }
-
ThreadMessageContext.setMessageContext(msg);
// If there is a supplied message ID, place its value into the Message Header under "MESSAGE_ID"