2009/3/19 <[email protected]>: > Author: rfeng > Date: Thu Mar 19 23:40:07 2009 > New Revision: 756264 > > URL: http://svn.apache.org/viewvc?rev=756264&view=rev > Log: > Fix the NPE when callback is not present > > Modified: > > tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServiceEndpointBuilderImpl.java > > tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/Endpoint2Impl.java > > Modified: > tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServiceEndpointBuilderImpl.java > URL: > http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServiceEndpointBuilderImpl.java?rev=756264&r1=756263&r2=756264&view=diff > ============================================================================== > --- > tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServiceEndpointBuilderImpl.java > (original) > +++ > tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServiceEndpointBuilderImpl.java > Thu Mar 19 23:40:07 2009 > @@ -138,7 +138,9 @@ > 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); > } > > Modified: > tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/Endpoint2Impl.java > URL: > http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/Endpoint2Impl.java?rev=756264&r1=756263&r2=756264&view=diff > ============================================================================== > --- > tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/Endpoint2Impl.java > (original) > +++ > tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/Endpoint2Impl.java > Thu Mar 19 23:40:07 2009 > @@ -108,15 +108,6 @@ > 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; > > >
Hi So this isn't going to do what you expect it to as the callback endpoint references won't have been created at the point you are trying to copy them into the service. I'll look at moving the loop that copies the endpoint references in to after the point that the references get created. Simon
