Fix the NPE when callback is not present

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

2 files changed, 3 insertions, 10 deletions

diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServiceEndpointBuilderImpl.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServiceEndpointBuilderImpl.java
index b4d2c0d9ea..1dc7af226a 100644
--- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServiceEndpointBuilderImpl.java
+++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServiceEndpointBuilderImpl.java
@@ -138,7 +138,9 @@ public class ComponentServiceEndpointBuilderImpl implements CompositeBuilder {
                     endpoint.setComponent(endpointComponent);
                     endpoint.setService(endpointService);
                     endpoint.setBinding(binding);
-                    endpoint.getCallbackEndpointReferences().addAll(callbackEndpointReferences);
+                    if (callbackEndpointReferences != null) {
+                        endpoint.getCallbackEndpointReferences().addAll(callbackEndpointReferences);
+                    }
                     endpoint.setUnresolved(false);
                     service.getEndpoints().add(endpoint);
                 }
diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/Endpoint2Impl.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/Endpoint2Impl.java
index 79434bd041..eb3b87dec0 100644
--- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/Endpoint2Impl.java
+++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/Endpoint2Impl.java
@@ -108,15 +108,6 @@ public class Endpoint2Impl implements Endpoint2 {
         return callbackEndpointReferences;
     }
     
-    /**
-     * Set the reference callback endpoint refefences
-     * 
-     * @param callbackEndpoint the reference callback endpoint
-     */
-    public void setCallbackEndpointReferences(List<EndpointReference2> callbackEndpointReferences)
-    {
-        this.callbackEndpointReferences = callbackEndpointReferences;
-    }
 /*
     public String getURI() {
         return uri;