diff options
Diffstat (limited to 'sca-java-2.x/trunk')
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" |