From 0bc82d8baa98f2bf9055837a3bf9bfdaf1b91991 Mon Sep 17 00:00:00 2001 From: slaws Date: Fri, 23 Mar 2012 13:02:44 +0000 Subject: Avoid NPE when binding doesn't support callback git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1304325 13f79535-47bb-0310-9956-ffa450edef68 --- .../sca/core/context/impl/CallbackServiceReferenceImpl.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'sca-java-2.x/trunk/modules/core/src/main') diff --git a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CallbackServiceReferenceImpl.java b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CallbackServiceReferenceImpl.java index e65dd10808..4c206ec5db 100644 --- a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CallbackServiceReferenceImpl.java +++ b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CallbackServiceReferenceImpl.java @@ -132,7 +132,12 @@ public class CallbackServiceReferenceImpl extends ServiceReferenceImpl { // to model the callback URI. With these changes the binding can just set a CallbackHandler // in the forward message to get the same effect. Some bindings don't do that hence // the various checks - this.resolvedEndpoint = msgContext.getFrom().getCallbackEndpoint(); + this.resolvedEndpoint = null; + + if (msgContext.getFrom() != null){ + resolvedEndpoint = msgContext.getFrom().getCallbackEndpoint(); + } + if (resolvedEndpoint != null){ if (resolvedEndpoint.getBinding() == null){ this.callbackHandler = new CallbackHandler(resolvedEndpoint.getURI()); -- cgit v1.2.3