From a98a7a903cc14275515508bce2076b9776dbd6b3 Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <apoutsma@vmware.com>
Date: Tue, 10 Nov 2009 14:50:15 +0000
Subject: [PATCH] SWS-566 - DelegatingSoapEndpointMapping produce NPE

---
 .../endpoint/mapping/DelegatingSoapEndpointMapping.java  | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/springframework/ws/soap/server/endpoint/mapping/DelegatingSoapEndpointMapping.java b/core/src/main/java/org/springframework/ws/soap/server/endpoint/mapping/DelegatingSoapEndpointMapping.java
index 66d1dd76..3ed55f35 100644
--- a/core/src/main/java/org/springframework/ws/soap/server/endpoint/mapping/DelegatingSoapEndpointMapping.java
+++ b/core/src/main/java/org/springframework/ws/soap/server/endpoint/mapping/DelegatingSoapEndpointMapping.java
@@ -76,8 +76,13 @@ public class DelegatingSoapEndpointMapping implements InitializingBean, SoapEndp
      */
     public EndpointInvocationChain getEndpoint(MessageContext messageContext) throws Exception {
         EndpointInvocationChain delegateChain = delegate.getEndpoint(messageContext);
-        return new SoapEndpointInvocationChain(delegateChain.getEndpoint(), delegateChain.getInterceptors(),
-                actorsOrRoles, isUltimateReceiver);
+        if (delegateChain != null) {
+            return new SoapEndpointInvocationChain(delegateChain.getEndpoint(), delegateChain.getInterceptors(),
+                    actorsOrRoles, isUltimateReceiver);
+        }
+        else {
+            return null;
+        }
     }
 
     public void afterPropertiesSet() throws Exception {