[SMX4-1719]NMRDestination would miss return exception in OutInterceptorChain in some cases
git-svn-id: https://svn.apache.org/repos/asf/servicemix/smx4/features/branches/features-4.5.x@1576231 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/cxf/cxf-transport-nmr/src/main/java/org/apache/servicemix/cxf/transport/nmr/NMRDestinationOutputStream.java b/cxf/cxf-transport-nmr/src/main/java/org/apache/servicemix/cxf/transport/nmr/NMRDestinationOutputStream.java
index e1223a4..4da734a 100644
--- a/cxf/cxf-transport-nmr/src/main/java/org/apache/servicemix/cxf/transport/nmr/NMRDestinationOutputStream.java
+++ b/cxf/cxf-transport-nmr/src/main/java/org/apache/servicemix/cxf/transport/nmr/NMRDestinationOutputStream.java
@@ -78,9 +78,25 @@
return;
} else {
InputStream bais = getInputStream();
+ Exchange xchng = inMessage.get(Exchange.class);
+ if (inMessage.getExchange().getOutFaultMessage() != null
+ && inMessage.getExchange().getOutFaultMessage().getContent(Exception.class) != null) {
+ //check if there is an OutFaultMessage and Exception here first and return the Error fast
+ Exception ex = inMessage.getExchange().getOutFaultMessage().getContent(Exception.class);
+ if (ex instanceof org.apache.cxf.interceptor.Fault) {
+ org.apache.cxf.interceptor.Fault f = (org.apache.cxf.interceptor.Fault)ex;
+ if (!f.hasDetails()) {
+ xchng.setError(f);
+ }
+ } else {
+ xchng.setError(ex);
+ }
+ channel.send(xchng);
+ return;
+ }
+
StreamSource ss = new StreamSource(bais);
- Exchange xchng = inMessage.get(Exchange.class);
LOG.fine(new org.apache.cxf.common.i18n.Message("CREATE.NORMALIZED.MESSAGE", LOG).toString());
if (inMessage.getExchange().getOutFaultMessage() != null) {
Exception ex = inMessage.getContent(Exception.class);
