Merge branch 'jaxrs' into trunk

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

1 files changed, 10 insertions, 10 deletions

diff --git a/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/EndpointReferenceBuilderImpl.java b/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/EndpointReferenceBuilderImpl.java
index d7c345b9f1..261909c52e 100644
--- a/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/EndpointReferenceBuilderImpl.java
+++ b/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/EndpointReferenceBuilderImpl.java
@@ -315,11 +315,11 @@ public class EndpointReferenceBuilderImpl {
                             endpointRef.setStatus(EndpointReference.Status.RESOLVED_BINDING);
                         }
                         
-                        if (reference.getCallbackService() != null) {
-                            Endpoint callbackEndpoint =
-                                createEndpoint(component, reference.getCallbackService(), false);
-                            endpointRef.setCallbackEndpoint(callbackEndpoint);
-                        }
+//                        if (reference.getCallbackService() != null) {
+//                            Endpoint callbackEndpoint =
+//                                createEndpoint(component, reference.getCallbackService(), false);
+//                            endpointRef.setCallbackEndpoint(callbackEndpoint);
+//                        }
                         
                         reference.getEndpointReferences().add(endpointRef);
                         continue;
@@ -352,11 +352,11 @@ public class EndpointReferenceBuilderImpl {
                     }
                     
                     endpointRef.setTargetEndpoint(endpoint);   
-                    if (reference.getCallbackService() != null) {
-                        Endpoint callbackEndpoint =
-                            createEndpoint(component, reference.getCallbackService(), false);
-                        endpointRef.setCallbackEndpoint(callbackEndpoint);
-                    }
+//                    if (reference.getCallbackService() != null) {
+//                        Endpoint callbackEndpoint =
+//                            createEndpoint(component, reference.getCallbackService(), false);
+//                        endpointRef.setCallbackEndpoint(callbackEndpoint);
+//                    }
                     reference.getEndpointReferences().add(endpointRef);
                 }
             }