Fix for AbstractAddressingEndpointMapping to filter SmartEndpointInterceptors

spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/server/AbstractAddressingEndpointMapping.java

@@ -266,7 +266,7 @@ public final EndpointInvocationChain getEndpoint(MessageContext messageContext)
                 if (endpoint == null) {
                     return null;
                 }
-                return getEndpointInvocationChain(endpoint, version, requestMap);
+                return getEndpointInvocationChain(endpoint, version, requestMap, messageContext);
             }
         }
         return null;
@@ -278,22 +278,30 @@ public final EndpointInvocationChain getEndpoint(MessageContext messageContext)
      */
     private EndpointInvocationChain getEndpointInvocationChain(Object endpoint,
                                                                AddressingVersion version,
-                                                               MessageAddressingProperties requestMap) {
+                                                               MessageAddressingProperties requestMap,
+                                                               MessageContext messageContext) {
         URI responseAction = getResponseAction(endpoint, requestMap);
         URI faultAction = getFaultAction(endpoint, requestMap);
 
 	    WebServiceMessageSender[] messageSenders = getMessageSenders(endpoint);
 	    MessageIdStrategy messageIdStrategy = getMessageIdStrategy(endpoint);
 
-	    List<EndpointInterceptor> interceptors = new ArrayList<EndpointInterceptor>(preInterceptors.length + postInterceptors.length + smartInterceptors.length + 1);
-	    AddressingEndpointInterceptor addressingInterceptor = new AddressingEndpointInterceptor(version, messageIdStrategy,
-             messageSenders, responseAction, faultAction);
-
-	    interceptors.addAll(Arrays.asList(preInterceptors));
-	    interceptors.add(addressingInterceptor);
-	    interceptors.addAll(Arrays.asList(postInterceptors));
-	    interceptors.addAll(Arrays.asList(smartInterceptors));
-
+        List<EndpointInterceptor> interceptors = new ArrayList<EndpointInterceptor>();
+        interceptors.addAll(Arrays.asList(preInterceptors));
+
+        AddressingEndpointInterceptor addressingInterceptor = new AddressingEndpointInterceptor(version, messageIdStrategy,
+	             messageSenders, responseAction, faultAction);
+        interceptors.add(addressingInterceptor);
+        interceptors.addAll(Arrays.asList(postInterceptors));
+
+        if (this.smartInterceptors != null) {
+            for (SmartEndpointInterceptor smartInterceptor : smartInterceptors) {
+                if (smartInterceptor.shouldIntercept(messageContext, endpoint)) {
+                    interceptors.add(smartInterceptor);
+                }
+            }
+        }
+
 	    return new SoapEndpointInvocationChain(endpoint,
 			    interceptors.toArray(new EndpointInterceptor[interceptors.size()]), actorsOrRoles, isUltimateReceiver);
     }

spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AnnotationActionMethodEndpointMappingTest.java

@@ -56,6 +56,7 @@ public void setUp() throws Exception {
         applicationContext = new StaticApplicationContext();
         applicationContext.registerSingleton("mapping", AnnotationActionEndpointMapping.class);
 	    applicationContext.registerSingleton("interceptor", MyInterceptor.class);
+        applicationContext.registerSingleton("smartIntercepter", MySmartInterceptor.class);
 	    applicationContext.registerSingleton("endpoint", MyEndpoint.class);
 	    applicationContext.refresh();
         mapping = (AnnotationActionEndpointMapping) applicationContext.getBean("mapping");
@@ -104,4 +105,15 @@ public MyInterceptor() {
 			super(new PayloadLoggingInterceptor());
 		}
 	}
+
+    private static class MySmartInterceptor extends DelegatingSmartEndpointInterceptor {
+
+		public MySmartInterceptor() {
+			super(new PayloadLoggingInterceptor());
+		}
+
+        public boolean shouldIntercept(MessageContext messageContext, Object endpoint) {
+            return false;
+        }
+    }
 }