TUSCANY-3932 - First part of this JIRA is to remove some inconsistencies in the way that callbacks are handled now. See JIRA for more comments on this first change.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1228150 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 6 insertions, 9 deletions

diff --git a/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/transport/TransportServiceInterceptor.java b/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/transport/TransportServiceInterceptor.java
index 42c0ce6993..0dc137cf5e 100644
--- a/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/transport/TransportServiceInterceptor.java
+++ b/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/transport/TransportServiceInterceptor.java
@@ -127,7 +127,7 @@ public class TransportServiceInterceptor extends InterceptorAsyncImpl {
             from.setStatus(EndpointReference.Status.WIRED_TARGET_FOUND_AND_MATCHED);
             msg.setFrom(from);
             Endpoint callbackEndpoint = assemblyFactory.createEndpoint();
-//            callbackEndpoint.setURI(callbackAddress); // TODO: is this needed? Seems to work without it
+            // binding is set into the callback endpoint in the CallbackDesitnationInterceptor           
             callbackEndpoint.setUnresolved(true);
             from.setCallbackEndpoint(callbackEndpoint);
 
diff --git a/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wire/CallbackDestinationInterceptor.java b/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wire/CallbackDestinationInterceptor.java
index f7573b182b..1bce6e8842 100644
--- a/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wire/CallbackDestinationInterceptor.java
+++ b/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wire/CallbackDestinationInterceptor.java
@@ -106,16 +106,13 @@ public class CallbackDestinationInterceptor extends InterceptorAsyncImpl {
                             throw new RuntimeException(e);
                         }
                         callbackBinding.setDestinationName(callbackdestName);
-                        msg.getHeaders().put("CALLBACK_BINDING", callbackBinding);
+                        // the "from" EPR model is created in the TransportServiceInterceptor
+                        // not sure which this destination calculation is not performed
+                        // there as well
+                        msg.getFrom().getCallbackEndpoint().setBinding(callbackBinding);
+//                        msg.getHeaders().put("CALLBACK_BINDING", callbackBinding);
                     }
                 }
-//            	List<EndpointReference> refs = endpoint.getCallbackEndpointReferences();
-//            	for (EndpointReference ref : refs ) {
-//            		if  (ref.getBinding() instanceof JMSBinding ) {
-//            			JMSBinding callbackBinding = (JMSBinding) ref.getBinding();
-//            			callbackBinding.setDestinationName(callbackdestName);
-//            		} // end if
-//            	} // end for
             } // end if  
 
 // Callback ID not used at present