Author: dkulp
Date: Wed Mar 27 18:05:25 2013
New Revision: 1461757
URL: http://svn.apache.org/r1461757
Log:
Merged revisions 1461739 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1461739 | dkulp | 2013-03-27 13:47:29 -0400 (Wed, 27 Mar 2013) | 2 lines
Output a better "message" into the exception.
........
Modified:
cxf/branches/2.7.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/Messages.properties
cxf/branches/2.7.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJOutInterceptor.java
Modified:
cxf/branches/2.7.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/Messages.properties
URL:
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/Messages.properties?rev=1461757&r1=1461756&r2=1461757&view=diff
==============================================================================
---
cxf/branches/2.7.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/Messages.properties
(original)
+++
cxf/branches/2.7.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/Messages.properties
Wed Mar 27 18:05:25 2013
@@ -19,5 +19,5 @@
#
#
SOAPHANDLERINTERCEPTOR_EXCEPTION = Problems creating SAAJ object model
-SOAPEXCEPTION = Problem writing SAAJ model to stream
+SOAPEXCEPTION = Problem writing SAAJ model to stream: {0}
XML_STREAM_EXC=Error reading XMLStreamReader.
Modified:
cxf/branches/2.7.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJOutInterceptor.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJOutInterceptor.java?rev=1461757&r1=1461756&r2=1461757&view=diff
==============================================================================
---
cxf/branches/2.7.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJOutInterceptor.java
(original)
+++
cxf/branches/2.7.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJOutInterceptor.java
Wed Mar 27 18:05:25 2013
@@ -112,7 +112,7 @@ public class SAAJOutInterceptor extends
saaj.getSOAPPart().getEnvelope().addHeader();
}
} catch (SOAPException e) {
- throw new SoapFault(new Message("SOAPEXCEPTION", BUNDLE),
+ throw new SoapFault(new Message("SOAPEXCEPTION", BUNDLE,
e.getMessage()),
e,
message.getVersion().getSender());
}
@@ -135,7 +135,7 @@ public class SAAJOutInterceptor extends
} catch (SOAPException e) {
- throw new SoapFault(new Message("SOAPEXCEPTION", BUNDLE), e,
version.getSender());
+ throw new SoapFault(new Message("SOAPEXCEPTION", BUNDLE,
e.getMessage()), e, version.getSender());
}
} else if (!message.containsKey(ORIGINAL_XML_WRITER)) {
//as the SOAPMessage already has everything in place, we do not
need XMLStreamWriter to write
@@ -218,7 +218,7 @@ public class SAAJOutInterceptor extends
throw new SoapFault(e.getCause().getMessage(), e,
message.getVersion().getSender());
} else {
- throw new SoapFault(new Message("SOAPEXCEPTION",
BUNDLE), e,
+ throw new SoapFault(new Message("SOAPEXCEPTION",
BUNDLE, e.getMessage()), e,
message.getVersion().getSender());
}
}
