Author: ningjiang
Date: Wed Dec 5 08:17:42 2012
New Revision: 1417306
URL: http://svn.apache.org/viewvc?rev=1417306&view=rev
Log:
Merged revisions 1417303 via svnmerge from
https://svn.apache.org/repos/asf/servicemix/smx4/features/trunk
........
r1417303 | ningjiang | 2012-12-05 16:03:50 +0800 (Wed, 05 Dec 2012) | 1 line
SMX4-1314 CXF NMR transport throws NPE when it handles the fault message
........
Modified:
servicemix/smx4/features/branches/features-4.4.x/ (props changed)
servicemix/smx4/features/branches/features-4.4.x/cxf/cxf-transport-nmr/src/main/java/org/apache/servicemix/cxf/transport/nmr/NMRDestinationOutputStream.java
Propchange: servicemix/smx4/features/branches/features-4.4.x/
------------------------------------------------------------------------------
Merged /servicemix/smx4/features/trunk:r1417303
Propchange: servicemix/smx4/features/branches/features-4.4.x/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Dec 5 08:17:42 2012
@@ -1 +1 @@
-/servicemix/smx4/features/trunk:1-1215210,1232811,1239315,1244513,1298713,1299584,1302577,1307720,1347872,1358015,1372709,1372733,1406451
+/servicemix/smx4/features/trunk:1-1215210,1232811,1239315,1244513,1298713,1299584,1302577,1307720,1347872,1358015,1372709,1372733,1406451,1417303
Modified:
servicemix/smx4/features/branches/features-4.4.x/cxf/cxf-transport-nmr/src/main/java/org/apache/servicemix/cxf/transport/nmr/NMRDestinationOutputStream.java
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/branches/features-4.4.x/cxf/cxf-transport-nmr/src/main/java/org/apache/servicemix/cxf/transport/nmr/NMRDestinationOutputStream.java?rev=1417306&r1=1417305&r2=1417306&view=diff
==============================================================================
---
servicemix/smx4/features/branches/features-4.4.x/cxf/cxf-transport-nmr/src/main/java/org/apache/servicemix/cxf/transport/nmr/NMRDestinationOutputStream.java
(original)
+++
servicemix/smx4/features/branches/features-4.4.x/cxf/cxf-transport-nmr/src/main/java/org/apache/servicemix/cxf/transport/nmr/NMRDestinationOutputStream.java
Wed Dec 5 08:17:42 2012
@@ -88,11 +88,11 @@ public class NMRDestinationOutputStream
LOG.fine(new
org.apache.cxf.common.i18n.Message("CREATE.NORMALIZED.MESSAGE",
LOG).toString());
if (inMessage.getExchange().getOutFaultMessage() != null) {
org.apache.cxf.interceptor.Fault f =
(org.apache.cxf.interceptor.Fault) inMessage.getContent(Exception.class);
- if (f.hasDetails()) {
- xchng.getFault().setBody(new DOMSource(doc));
- } else {
+ if (!f.hasDetails()) {
xchng.setError(f);
}
+ // As the fault is already marshalled by the fault handler
+ xchng.getFault().setBody(new DOMSource(doc));
} else {
//copy attachments
if (outMessage != null && outMessage.getAttachments() !=
null) {
