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

SWS-308

Browse Source
This commit is contained in:
Arjen Poutsma
2008-03-18 11:12:29 +00:00
parent a4f3017816
commit ebc15af29f
2 changed files with 53 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/src/main/java/org/springframework/ws/client/core/WebServiceTemplate.java
View File

@@ -530,17 +530,16 @@ public class WebServiceTemplate extends WebServiceAccessor implements WebService
* @throws IOException in case of I/O errors
*/
protected boolean hasError(WebServiceConnection connection, WebServiceMessage request) throws IOException {
if (connection.hasError()) {
// this could be a fault rather than an error
if (connection instanceof FaultAwareWebServiceConnection) {
FaultAwareWebServiceConnection faultConnection = (FaultAwareWebServiceConnection) connection;
if (faultConnection.hasFault() && request instanceof FaultAwareWebServiceMessage) {
return false;
}
}
return true;
if (!connection.hasError()) {
return false;
}
if (checkConnectionForFault && connection instanceof FaultAwareWebServiceConnection) {
FaultAwareWebServiceConnection faultConnection = (FaultAwareWebServiceConnection) connection;
return !(faultConnection.hasFault() && request instanceof FaultAwareWebServiceMessage);
}
else {
return checkConnectionForFault;
}
return false;
}
/**
@@ -673,7 +672,7 @@ public class WebServiceTemplate extends WebServiceAccessor implements WebService
private final WebServiceMessageCallback callback;
public WebServiceMessageCallbackMessageExtractor(WebServiceMessageCallback callback) {
private WebServiceMessageCallbackMessageExtractor(WebServiceMessageCallback callback) {
this.callback = callback;
}
@@ -688,7 +687,7 @@ public class WebServiceTemplate extends WebServiceAccessor implements WebService
private final SourceExtractor sourceExtractor;
public SourceExtractorMessageExtractor(SourceExtractor sourceExtractor) {
private SourceExtractorMessageExtractor(SourceExtractor sourceExtractor) {
this.sourceExtractor = sourceExtractor;
}
@@ -697,5 +696,4 @@ public class WebServiceTemplate extends WebServiceAccessor implements WebService
}
}
}