You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ay...@apache.org on 2011/08/16 10:23:17 UTC
svn commit: r1158148 - in /cxf/branches/2.4.x-fixes: ./
rt/core/src/main/java/org/apache/cxf/interceptor/transform/TransformOutInterceptor.java
Author: ay
Date: Tue Aug 16 08:23:17 2011
New Revision: 1158148
URL: http://svn.apache.org/viewvc?rev=1158148&view=rev
Log:
Merged revisions 1158144 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1158144 | ay | 2011-08-16 10:13:51 +0200 (Tue, 16 Aug 2011) | 1 line
[CXF-3744] fixing TransformOutInterceptor's fault case handling
........
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/transform/TransformOutInterceptor.java
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 16 08:23:17 2011
@@ -1 +1 @@
-/cxf/trunk:1157121,1157699
+/cxf/trunk:1157121,1157699,1158144
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/transform/TransformOutInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/transform/TransformOutInterceptor.java?rev=1158148&r1=1158147&r2=1158148&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/transform/TransformOutInterceptor.java (original)
+++ cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/transform/TransformOutInterceptor.java Tue Aug 16 08:23:17 2011
@@ -81,6 +81,10 @@ public class TransformOutInterceptor ext
return;
}
+ if (null != message.getContent(Exception.class)) {
+ return;
+ }
+
XMLStreamWriter writer = message.getContent(XMLStreamWriter.class);
OutputStream out = message.getContent(OutputStream.class);