Add a QName as the type for binding/implementation and use it to compare model types instead of class

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

1 files changed, 8 insertions, 8 deletions

diff --git a/java/sca/modules/endpoint/src/main/java/org/apache/tuscany/sca/endpoint/impl/EndpointReferenceBuilderImpl.java b/java/sca/modules/endpoint/src/main/java/org/apache/tuscany/sca/endpoint/impl/EndpointReferenceBuilderImpl.java
index d4a9f31497..430b57f2ad 100644
--- a/java/sca/modules/endpoint/src/main/java/org/apache/tuscany/sca/endpoint/impl/EndpointReferenceBuilderImpl.java
+++ b/java/sca/modules/endpoint/src/main/java/org/apache/tuscany/sca/endpoint/impl/EndpointReferenceBuilderImpl.java
@@ -175,18 +175,18 @@ public class EndpointReferenceBuilderImpl implements CompositeBuilder, EndpointR
         } else {
             if (endpoint.isUnresolved() == false){
                 // Wired - service resolved - binding matched
-                // The service is in the same composite or the 
+                // The service is in the same composite or the
                 // binding is remote and has a full URI
-                
+
                 // still need to check that the callback endpoint is set correctly
                 if ((endpointReference.getCallbackEndpoint() != null) &&
                     (endpointReference.getCallbackEndpoint().isUnresolved() == false)){
                     return;
-                } 
-                
+                }
+
                 matchCallbackBinding(endpointReference,
                                      monitor);
-                
+
                 return;
             }
 
@@ -271,7 +271,7 @@ public class EndpointReferenceBuilderImpl implements CompositeBuilder, EndpointR
                 if (local) {
                     for (Endpoint serviceEndpoint : endpoint.getService().getEndpoints()) {
 
-                        if (referenceBinding.getClass() == serviceEndpoint.getBinding().getClass() && hasCompatiblePolicySets(referenceBinding,
+                        if (referenceBinding.getType().equals(serviceEndpoint.getBinding().getType()) && hasCompatiblePolicySets(referenceBinding,
                                                                                                                               serviceEndpoint
                                                                                                                                   .getBinding())) {
 
@@ -281,7 +281,7 @@ public class EndpointReferenceBuilderImpl implements CompositeBuilder, EndpointR
                     }
                 } else {
                     Endpoint serviceEndpoint = endpoint;
-                    if (referenceBinding.getClass() == serviceEndpoint.getBinding().getClass() && hasCompatiblePolicySets(referenceBinding,
+                    if (referenceBinding.getType().equals(serviceEndpoint.getBinding().getType()) && hasCompatiblePolicySets(referenceBinding,
                                                                                                                           serviceEndpoint
                                                                                                                               .getBinding())) {
 
@@ -399,7 +399,7 @@ public class EndpointReferenceBuilderImpl implements CompositeBuilder, EndpointR
                 for (EndpointReference epr : callbackEndpointReferences) {
                     for (Endpoint ep : callbackEndpoints) {
 
-                        if (epr.getBinding().getClass() == ep.getBinding().getClass() &&
+                        if (epr.getBinding().getType().equals(ep.getBinding().getType()) &&
                             hasCompatiblePolicySets(epr.getBinding(), ep.getBinding())) {
 
                             matchedEndpoint.add(ep);