You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2013/05/16 13:41:52 UTC
svn commit: r1483305 - in
/cxf/branches/wss4j2.0-port/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor:
CheckFaultInterceptor.java Messages.properties ReadHeadersInterceptor.java
StartBodyInterceptor.java
Author: coheigea
Date: Thu May 16 11:41:52 2013
New Revision: 1483305
URL: http://svn.apache.org/r1483305
Log:
Return error message when a streaming exception occurs in the soap binding
Modified:
cxf/branches/wss4j2.0-port/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/CheckFaultInterceptor.java
cxf/branches/wss4j2.0-port/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Messages.properties
cxf/branches/wss4j2.0-port/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java
cxf/branches/wss4j2.0-port/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/StartBodyInterceptor.java
Modified: cxf/branches/wss4j2.0-port/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/CheckFaultInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/CheckFaultInterceptor.java?rev=1483305&r1=1483304&r2=1483305&view=diff
==============================================================================
--- cxf/branches/wss4j2.0-port/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/CheckFaultInterceptor.java (original)
+++ cxf/branches/wss4j2.0-port/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/CheckFaultInterceptor.java Thu May 16 11:41:52 2013
@@ -59,7 +59,7 @@ public class CheckFaultInterceptor exten
return;
}
} catch (XMLStreamException e) {
- throw new SoapFault(new Message("XML_STREAM_EXC", LOG), e,
+ throw new SoapFault(new Message("XML_STREAM_EXC", LOG, e.getMessage()), e,
message.getVersion().getSender());
}
if (message.getVersion().getFault().equals(xmlReader.getName()) && isRequestor(message)) {
Modified: cxf/branches/wss4j2.0-port/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Messages.properties
URL: http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Messages.properties?rev=1483305&r1=1483304&r2=1483305&view=diff
==============================================================================
--- cxf/branches/wss4j2.0-port/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Messages.properties (original)
+++ cxf/branches/wss4j2.0-port/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Messages.properties Thu May 16 11:41:52 2013
@@ -19,7 +19,7 @@
#
#
-XML_STREAM_EXC=Error reading XMLStreamReader.
+XML_STREAM_EXC=Error reading XMLStreamReader: {0}
XML_WRITE_EXC=Error writing to XMLStreamWriter.
COULD_NOT_VALIDATE_SOAP_HEADER_CAUSED_BY=Could not validate soapheader caused by: {0}: {1}.
MUST_UNDERSTAND=MustUnderstand headers: {0} are not understood.
Modified: cxf/branches/wss4j2.0-port/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java?rev=1483305&r1=1483304&r2=1483305&view=diff
==============================================================================
--- cxf/branches/wss4j2.0-port/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java (original)
+++ cxf/branches/wss4j2.0-port/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java Thu May 16 11:41:52 2013
@@ -250,7 +250,8 @@ public class ReadHeadersInterceptor exte
}
}
} catch (XMLStreamException e) {
- throw new SoapFault(new Message("XML_STREAM_EXC", LOG), e, message.getVersion().getSender());
+ throw new SoapFault(new Message("XML_STREAM_EXC", LOG, e.getMessage()), e,
+ message.getVersion().getSender());
} finally {
if (closeNeeded) {
StaxUtils.close(xmlReader);
Modified: cxf/branches/wss4j2.0-port/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/StartBodyInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/StartBodyInterceptor.java?rev=1483305&r1=1483304&r2=1483305&view=diff
==============================================================================
--- cxf/branches/wss4j2.0-port/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/StartBodyInterceptor.java (original)
+++ cxf/branches/wss4j2.0-port/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/StartBodyInterceptor.java Thu May 16 11:41:52 2013
@@ -62,7 +62,8 @@ public class StartBodyInterceptor extend
i = xmlReader.next();
}
} catch (XMLStreamException e) {
- throw new SoapFault(new Message("XML_STREAM_EXC", LOG), e, message.getVersion().getSender());
+ throw new SoapFault(new Message("XML_STREAM_EXC", LOG, e.getMessage()), e,
+ message.getVersion().getSender());
}
}