This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new b6ad0ff CXF-8234 - Checkstyle fix
b6ad0ff is described below
commit b6ad0ff3398af050c727c3dd3e711b63fd02a783
Author: Colm O hEigeartaigh <[email protected]>
AuthorDate: Tue Mar 10 10:43:52 2020 +0000
CXF-8234 - Checkstyle fix
---
.../apache/cxf/interceptor/transform/TransformOutInterceptor.java | 7 +++----
1 file changed, 3 insertions(+), 4 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 a6e1185..505c3d1 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
@@ -26,7 +26,6 @@ import java.util.Map;
import javax.xml.stream.XMLStreamWriter;
-import org.apache.cxf.interceptor.AbstractOutDatabindingInterceptor;
import org.apache.cxf.interceptor.StaxOutEndingInterceptor;
import org.apache.cxf.interceptor.StaxOutInterceptor;
import org.apache.cxf.message.Message;
@@ -35,6 +34,7 @@ import org.apache.cxf.phase.AbstractPhaseInterceptor;
import org.apache.cxf.phase.Phase;
import org.apache.cxf.staxutils.transform.TransformUtils;
+import static
org.apache.cxf.interceptor.AbstractOutDatabindingInterceptor.DISABLE_OUTPUTSTREAM_OPTIMIZATION;
/**
* Creates an XMLStreamReader from the InputStream on the Message.
@@ -98,9 +98,8 @@ public class TransformOutInterceptor extends
AbstractPhaseInterceptor<Message> {
XMLStreamWriter transformWriter =
createTransformWriterIfNeeded(writer, out);
if (transformWriter != null) {
message.setContent(XMLStreamWriter.class, transformWriter);
- if
(message.getContextualProperty(AbstractOutDatabindingInterceptor.DISABLE_OUTPUTSTREAM_OPTIMIZATION)
== null) {
-
message.put(AbstractOutDatabindingInterceptor.DISABLE_OUTPUTSTREAM_OPTIMIZATION,
- Boolean.TRUE);
+ if
(message.getContextualProperty(DISABLE_OUTPUTSTREAM_OPTIMIZATION) == null) {
+ message.put(DISABLE_OUTPUTSTREAM_OPTIMIZATION, Boolean.TRUE);
}
if (MessageUtils.isRequestor(message)) {
message.removeContent(OutputStream.class);