svn commit: r1301373 - /tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CallbackServiceReferenceImpl.java

[slaws]

Author: slaws
Date: Fri Mar 16 08:24:13 2012
New Revision: 1301373

URL: http://svn.apache.org/viewvc?rev=1301373&view=rev
Log:
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. 

Modified:
    
tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CallbackServiceReferenceImpl.java

Modified: 
tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CallbackServiceReferenceImpl.java
URL: 
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CallbackServiceReferenceImpl.java?rev=1301373&r1=1301372&r2=1301373&view=diff
==============================================================================
--- 
tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CallbackServiceReferenceImpl.java
 (original)
+++ 
tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CallbackServiceReferenceImpl.java
 Fri Mar 16 08:24:13 2012
@@ -133,8 +133,10 @@ public class CallbackServiceReferenceImp
         // 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());