From 3a09d293195b1e43077ea9390255adb07ed78313 Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <apoutsma@vmware.com>
Date: Mon, 15 Apr 2013 16:06:26 +0200
Subject: [PATCH] Call handleResponse when exception resolver rethrows
 exception

Issue: SWS-824
---
 .../org/springframework/ws/server/MessageDispatcher.java     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/springframework/ws/server/MessageDispatcher.java b/core/src/main/java/org/springframework/ws/server/MessageDispatcher.java
index 222fe756..9203bfaf 100644
--- a/core/src/main/java/org/springframework/ws/server/MessageDispatcher.java
+++ b/core/src/main/java/org/springframework/ws/server/MessageDispatcher.java
@@ -232,6 +232,8 @@ public class MessageDispatcher implements WebServiceMessageReceiver, BeanNameAwa
                 EndpointAdapter endpointAdapter = getEndpointAdapter(mappedEndpoint.getEndpoint());
                 endpointAdapter.invoke(messageContext, mappedEndpoint.getEndpoint());
 
+	            // Apply handleResponse methods of registered interceptors
+	            triggerHandleResponse(mappedEndpoint, interceptorIndex, messageContext);
             }
             catch (NoEndpointFoundException ex) {
                 // No triggering of interceptors if no endpoint is found
@@ -243,9 +245,8 @@ public class MessageDispatcher implements WebServiceMessageReceiver, BeanNameAwa
             catch (Exception ex) {
                 Object endpoint = mappedEndpoint != null ? mappedEndpoint.getEndpoint() : null;
                 processEndpointException(messageContext, endpoint, ex);
+	            triggerHandleResponse(mappedEndpoint, interceptorIndex, messageContext);
             }
-            // Apply handleResponse methods of registered interceptors
-            triggerHandleResponse(mappedEndpoint, interceptorIndex, messageContext);
             triggerAfterCompletion(mappedEndpoint, interceptorIndex, messageContext, null);
         }
         catch (NoEndpointFoundException ex) {