From 40bd80f6d0f0dc5eb129c1aae43c814ad33875af Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <apoutsma@vmware.com>
Date: Sat, 6 Oct 2007 12:04:30 +0000
Subject: [PATCH] SWS-204

---
 .../ws/server/endpoint/AbstractEndpointExceptionResolver.java | 4 ++--
 .../org/springframework/ws/soap/saaj/SaajSoap12Fault.java     | 2 +-
 .../AbstractSoapFaultDefinitionExceptionResolver.java         | 2 +-
 .../ws/soap/server/endpoint/SimpleSoapExceptionResolver.java  | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/AbstractEndpointExceptionResolver.java b/core/src/main/java/org/springframework/ws/server/endpoint/AbstractEndpointExceptionResolver.java
index 92b85c7b..c85b3da2 100644
--- a/core/src/main/java/org/springframework/ws/server/endpoint/AbstractEndpointExceptionResolver.java
+++ b/core/src/main/java/org/springframework/ws/server/endpoint/AbstractEndpointExceptionResolver.java
@@ -72,7 +72,7 @@ public abstract class AbstractEndpointExceptionResolver implements EndpointExcep
      * Default implementation that checks whether the given <code>endpoint</code> is in the set of {@link
      * #setMappedEndpoints mapped endpoints}.
      *
-     * @see #resolveExceptionInternal(org.springframework.ws.context.MessageContext,Object,Exception)
+     * @see #resolveExceptionInternal(MessageContext,Object,Exception)
      */
     public final boolean resolveException(MessageContext messageContext, Object endpoint, Exception ex) {
         if (mappedEndpoints != null && !mappedEndpoints.contains(endpoint)) {
@@ -88,7 +88,7 @@ public abstract class AbstractEndpointExceptionResolver implements EndpointExcep
      * @param endpoint       the executed endpoint, or <code>null</code> if none chosen at the time of the exception
      * @param ex             the exception that got thrown during endpoint execution
      * @return <code>true</code> if resolved; <code>false</code> otherwise
-     * @see #resolveException(org.springframework.ws.context.MessageContext,Object,Exception)
+     * @see #resolveException(MessageContext,Object,Exception)
      */
     protected abstract boolean resolveExceptionInternal(MessageContext messageContext, Object endpoint, Exception ex);
 
diff --git a/core/src/main/java/org/springframework/ws/soap/saaj/SaajSoap12Fault.java b/core/src/main/java/org/springframework/ws/soap/saaj/SaajSoap12Fault.java
index 365e4880..f66973d3 100644
--- a/core/src/main/java/org/springframework/ws/soap/saaj/SaajSoap12Fault.java
+++ b/core/src/main/java/org/springframework/ws/soap/saaj/SaajSoap12Fault.java
@@ -94,6 +94,6 @@ class SaajSoap12Fault extends SaajSoapFault implements Soap12Fault {
     }
 
     public String getFaultStringOrReason() {
-        return getFaultReasonText(Locale.getDefault());
+        return getImplementation().getFaultString(getSaajFault());
     }
 }
diff --git a/core/src/main/java/org/springframework/ws/soap/server/endpoint/AbstractSoapFaultDefinitionExceptionResolver.java b/core/src/main/java/org/springframework/ws/soap/server/endpoint/AbstractSoapFaultDefinitionExceptionResolver.java
index 67bd637c..f9ec1e81 100644
--- a/core/src/main/java/org/springframework/ws/soap/server/endpoint/AbstractSoapFaultDefinitionExceptionResolver.java
+++ b/core/src/main/java/org/springframework/ws/soap/server/endpoint/AbstractSoapFaultDefinitionExceptionResolver.java
@@ -55,7 +55,7 @@ public abstract class AbstractSoapFaultDefinitionExceptionResolver extends Abstr
     protected abstract SoapFaultDefinition getFaultDefinition(Object endpoint, Exception ex);
 
     protected final boolean resolveExceptionInternal(MessageContext messageContext, Object endpoint, Exception ex) {
-        Assert.isTrue(messageContext.getResponse() instanceof SoapMessage,
+        Assert.isInstanceOf(SoapMessage.class, messageContext.getResponse(),
                 "AbstractSoapFaultDefinitionExceptionResolver requires a SoapMessage");
 
         SoapFaultDefinition definition = getFaultDefinition(endpoint, ex);
diff --git a/core/src/main/java/org/springframework/ws/soap/server/endpoint/SimpleSoapExceptionResolver.java b/core/src/main/java/org/springframework/ws/soap/server/endpoint/SimpleSoapExceptionResolver.java
index 3c904d8c..2e84b2c1 100644
--- a/core/src/main/java/org/springframework/ws/soap/server/endpoint/SimpleSoapExceptionResolver.java
+++ b/core/src/main/java/org/springframework/ws/soap/server/endpoint/SimpleSoapExceptionResolver.java
@@ -58,7 +58,7 @@ public class SimpleSoapExceptionResolver extends AbstractEndpointExceptionResolv
     }
 
     protected final boolean resolveExceptionInternal(MessageContext messageContext, Object endpoint, Exception ex) {
-        Assert.isTrue(messageContext.getResponse() instanceof SoapMessage,
+        Assert.isInstanceOf(SoapMessage.class, messageContext.getResponse(),
                 "SimpleSoapExceptionResolver requires a SoapMessage");
         SoapMessage response = (SoapMessage) messageContext.getResponse();
         String faultString = StringUtils.hasLength(ex.getMessage()) ? ex.getMessage() : ex.toString();