SWS-204

Author: poutsma

core/src/main/java/org/springframework/ws/server/endpoint/AbstractEndpointExceptionResolver.java

@@ -72,7 +72,7 @@ public final int getOrder() {
      * 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 final boolean resolveException(MessageContext messageContext, Object endp
      * @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);
 

core/src/main/java/org/springframework/ws/soap/saaj/SaajSoap12Fault.java

@@ -94,6 +94,6 @@ public String getFaultReasonText(Locale locale) {
     }
 
     public String getFaultStringOrReason() {
-        return getFaultReasonText(Locale.getDefault());
+        return getImplementation().getFaultString(getSaajFault());
     }
 }

core/src/main/java/org/springframework/ws/soap/server/endpoint/AbstractSoapFaultDefinitionExceptionResolver.java

@@ -55,7 +55,7 @@ public void setDefaultFault(SoapFaultDefinition defaultFault) {
     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);

core/src/main/java/org/springframework/ws/soap/server/endpoint/SimpleSoapExceptionResolver.java

@@ -58,7 +58,7 @@ public void setLocale(Locale locale) {
     }
 
     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();