svn commit: r1743802 - /webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/stax/MTOMXMLStreamWriterImpl.java

[ve...@apache.org]

Author: veithen
Date: Sat May 14 10:41:47 2016
New Revision: 1743802

URL: http://svn.apache.org/viewvc?rev=1743802&view=rev
Log:
Code simplification.

Modified:
    webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/stax/MTOMXMLStreamWriterImpl.java

Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/stax/MTOMXMLStreamWriterImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/stax/MTOMXMLStreamWriterImpl.java?rev=1743802&r1=1743801&r2=1743802&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/stax/MTOMXMLStreamWriterImpl.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/stax/MTOMXMLStreamWriterImpl.java Sat May 14 10:41:47 2016
@@ -73,10 +73,9 @@ public class MTOMXMLStreamWriterImpl ext
     
     private static final Log log = LogFactory.getLog(MTOMXMLStreamWriterImpl.class);
     private XMLStreamWriter xmlWriter;
-    private OutputStream outStream;
     private List<Part> otherParts = new LinkedList<Part>();
     private OMMultipartWriter multipartWriter;
-    private OutputStream rootPartOutputStream;
+    private final OutputStream rootPartOutputStream;
     private OMOutputFormat format;
     private final OptimizationPolicy optimizationPolicy;
     private final boolean preserveAttachments;
@@ -97,6 +96,7 @@ public class MTOMXMLStreamWriterImpl ext
         this.format = format;
         optimizationPolicy = new OptimizationPolicyImpl(format);
         preserveAttachments = true;
+        rootPartOutputStream = null;
     }
 
     public MTOMXMLStreamWriterImpl(XMLStreamWriter xmlWriter) {
@@ -134,7 +134,6 @@ public class MTOMXMLStreamWriterImpl ext
             log.trace("Call Stack =" + CommonUtils.callStackToString());
         }
         this.format = format;
-        this.outStream = outStream;
         this.preserveAttachments = preserveAttachments;
 
         String encoding = format.getCharSetEncoding();
@@ -160,6 +159,7 @@ public class MTOMXMLStreamWriterImpl ext
                     format.getStAXWriterConfiguration(), rootPartOutputStream, encoding),
                     contentIDGenerator, optimizationPolicy);
         } else {
+            rootPartOutputStream = outStream;
             xmlWriter = StAXUtils.createXMLStreamWriter(format.getStAXWriterConfiguration(),
                     outStream, format.getCharSetEncoding());
         }
@@ -555,31 +555,22 @@ public class MTOMXMLStreamWriterImpl ext
             return null;
         }
         
-        OutputStream os = null;
-        if (rootPartOutputStream != null) {
-            os = rootPartOutputStream;
-        } else {
-            os = outStream;
-        }
-        
         if (log.isDebugEnabled()) {
-            if (os == null) {
+            if (rootPartOutputStream == null) {
                 log.debug("Direct access to the output stream is not available.");
-            } else if (rootPartOutputStream != null) {
-                log.debug("Returning access to the buffered xml stream: " + rootPartOutputStream);
             } else {
-                log.debug("Returning access to the original output stream: " + os);
+                log.debug("Returning access to the output stream: " + rootPartOutputStream);
             }
         }
        
-        if (os != null) {
+        if (rootPartOutputStream != null) {
             // Flush the state of the writer..Many times the 
             // write defers the writing of tag characters (>)
             // until the next write.  Flush out this character
             this.writeCharacters(""); 
             this.flush();
         }
-        return os;
+        return rootPartOutputStream;
     }
     
     public void setFilter(XMLStreamWriterFilter filter) {