[cxf] 04/06: CXF-8234 - Only disable output stream optimization in TransformOutInterceptor if it isn't configured already

[coheigea]

This is an automated email from the ASF dual-hosted git repository.

coheigea pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit 0847626fd44c91b2cb7be5650dc49fb6aaba144b
Author: Colm O hEigeartaigh <cohei...@apache.org>
AuthorDate: Tue Mar 10 10:08:26 2020 +0000

    CXF-8234 - Only disable output stream optimization in 
TransformOutInterceptor if it isn't configured already
    
    (cherry picked from commit 71ed1be91ce6fcadeb16d6fb86e513cf3a95ee52)
---
 .../apache/cxf/interceptor/transform/TransformOutInterceptor.java   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git 
a/core/src/main/java/org/apache/cxf/interceptor/transform/TransformOutInterceptor.java
 
b/core/src/main/java/org/apache/cxf/interceptor/transform/TransformOutInterceptor.java
index 54878f9..a6e1185 100644
--- 
a/core/src/main/java/org/apache/cxf/interceptor/transform/TransformOutInterceptor.java
+++ 
b/core/src/main/java/org/apache/cxf/interceptor/transform/TransformOutInterceptor.java
@@ -98,8 +98,10 @@ public class TransformOutInterceptor extends 
AbstractPhaseInterceptor<Message> {
         XMLStreamWriter transformWriter = 
createTransformWriterIfNeeded(writer, out);
         if (transformWriter != null) {
             message.setContent(XMLStreamWriter.class, transformWriter);
-            
message.put(AbstractOutDatabindingInterceptor.DISABLE_OUTPUTSTREAM_OPTIMIZATION,
-                        Boolean.TRUE);
+            if 
(message.getContextualProperty(AbstractOutDatabindingInterceptor.DISABLE_OUTPUTSTREAM_OPTIMIZATION)
 == null) {
+                
message.put(AbstractOutDatabindingInterceptor.DISABLE_OUTPUTSTREAM_OPTIMIZATION,
+                            Boolean.TRUE);
+            }
             if (MessageUtils.isRequestor(message)) {
                 message.removeContent(OutputStream.class);
                 message.put(OUTPUT_STREAM_HOLDER, out);