1 files changed, 9 insertions, 0 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 261909c52e..9938a054c5 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
@@ -659,6 +659,15 @@ public class EndpointReferenceBuilderImpl {
         endpointRef.setComponent(component);
         endpointRef.setReference(reference);
         endpointRef.setUnresolved(unresolved);
+
+        // [rfeng] Populate the callback endpoints
+        if (reference.getCallbackService() != null) {
+            List<Endpoint> callbackEndpoints = reference.getCallbackService().getEndpoints();
+            if (!callbackEndpoints.isEmpty()) {
+                // [rfeng] FIXME: how to select the callback endpoints?
+                endpointRef.setCallbackEndpoint(callbackEndpoints.get(0));
+            }
+        }
         return endpointRef;
     } // end method createEndpointRef