summaryrefslogtreecommitdiffstats
path: root/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java
diff options
context:
space:
mode:
Diffstat (limited to 'sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java')
-rw-r--r--sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/transport/TransportServiceInterceptor.java2
-rw-r--r--sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wire/CallbackDestinationInterceptor.java13
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