Spring/spring-ws
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SWS-204

Browse Source
This commit is contained in:
Arjen Poutsma
2007-10-06 12:04:30 +00:00
parent 6f28ad3c9d
commit 40bd80f6d0
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);

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

@@ -94,6 +94,6 @@ class SaajSoap12Fault extends SaajSoapFault implements Soap12Fault {
}
public String getFaultStringOrReason() {
return getFaultReasonText(Locale.getDefault());
return getImplementation().getFaultString(getSaajFault());
}
}

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

@@ -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);

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

@@ -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();