From 2004935f8973b9e44b5db4ad3da396e7d43960e7 Mon Sep 17 00:00:00 2001 From: Arjen Poutsma Date: Wed, 13 May 2009 10:02:06 +0000 Subject: [PATCH] SWS-486 - SaajSoap11Body.getFault() does not conforms to interface specification - if no fault is present IllegalArgumentException is thrown instead of returning null. --- .../java/org/springframework/ws/soap/saaj/SaajSoap11Body.java | 4 ++-- .../java/org/springframework/ws/soap/saaj/SaajSoap12Body.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/org/springframework/ws/soap/saaj/SaajSoap11Body.java b/core/src/main/java/org/springframework/ws/soap/saaj/SaajSoap11Body.java index 39857a87..2f2303e7 100644 --- a/core/src/main/java/org/springframework/ws/soap/saaj/SaajSoap11Body.java +++ b/core/src/main/java/org/springframework/ws/soap/saaj/SaajSoap11Body.java @@ -36,13 +36,13 @@ import org.springframework.ws.soap.soap11.Soap11Fault; */ class SaajSoap11Body extends SaajSoapBody implements Soap11Body { - public SaajSoap11Body(SOAPBody body) { + SaajSoap11Body(SOAPBody body) { super(body); } public SoapFault getFault() { SOAPFault fault = getImplementation().getFault(getSaajBody()); - return new SaajSoap11Fault(fault); + return fault != null ? new SaajSoap11Fault(fault) : null; } public Soap11Fault addFault(QName faultCode, String faultString, Locale faultStringLocale) { diff --git a/core/src/main/java/org/springframework/ws/soap/saaj/SaajSoap12Body.java b/core/src/main/java/org/springframework/ws/soap/saaj/SaajSoap12Body.java index 7c2dd924..d736e153 100644 --- a/core/src/main/java/org/springframework/ws/soap/saaj/SaajSoap12Body.java +++ b/core/src/main/java/org/springframework/ws/soap/saaj/SaajSoap12Body.java @@ -36,13 +36,13 @@ import org.springframework.ws.soap.soap12.Soap12Fault; */ class SaajSoap12Body extends SaajSoapBody implements Soap12Body { - public SaajSoap12Body(SOAPBody body) { + SaajSoap12Body(SOAPBody body) { super(body); } public SoapFault getFault() { SOAPFault fault = getImplementation().getFault(getSaajBody()); - return new SaajSoap12Fault(fault); + return fault != null ? new SaajSoap12Fault(fault) : null; } public SoapFault addClientOrSenderFault(String faultString, Locale locale) {