From 76835ec65da7e3749d7173816f1032a9a6efe6f8 Mon Sep 17 00:00:00 2001 From: slaws Date: Fri, 16 Mar 2012 08:24:13 +0000 Subject: TUSCANY-3932 - take account of the case where a binding doesn't create a binding model in the callback endpoint an just put the URL in the endpoint. git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1301373 13f79535-47bb-0310-9956-ffa450edef68 --- .../tuscany/sca/core/context/impl/CallbackServiceReferenceImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CallbackServiceReferenceImpl.java b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CallbackServiceReferenceImpl.java index b0561303a8..e65dd10808 100644 --- a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CallbackServiceReferenceImpl.java +++ b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CallbackServiceReferenceImpl.java @@ -133,8 +133,10 @@ public class CallbackServiceReferenceImpl extends ServiceReferenceImpl { // in the forward message to get the same effect. Some bindings don't do that hence // the various checks this.resolvedEndpoint = msgContext.getFrom().getCallbackEndpoint(); - if (resolvedEndpoint != null && resolvedEndpoint.getBinding() != null){ - if (resolvedEndpoint.getBinding().getType().equals(SCABinding.TYPE)){ + if (resolvedEndpoint != null){ + if (resolvedEndpoint.getBinding() == null){ + this.callbackHandler = new CallbackHandler(resolvedEndpoint.getURI()); + } else if (resolvedEndpoint.getBinding().getType().equals(SCABinding.TYPE)){ this.callbackHandler = new CallbackHandler(resolvedEndpoint.getURI()); } else { this.callbackHandler = new CallbackHandler(resolvedEndpoint.getBinding().getURI()); -- cgit v1.2.3