svn commit: r1735194 - /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/XMLUtils.java

[ve...@apache.org]

Author: veithen
Date: Wed Mar 16 07:52:09 2016
New Revision: 1735194

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

Modified:
    axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/XMLUtils.java

Modified: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/XMLUtils.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/XMLUtils.java?rev=1735194&r1=1735193&r2=1735194&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/XMLUtils.java (original)
+++ axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/XMLUtils.java Wed Mar 16 07:52:09 2016
@@ -45,12 +45,6 @@ import javax.xml.parsers.ParserConfigura
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
 import javax.xml.stream.XMLStreamException;
-import javax.xml.transform.Result;
-import javax.xml.transform.Source;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -509,39 +503,10 @@ public class XMLUtils {
      * @throws Exception
      */
     public static OMElement toOM(Element element) throws Exception {
-        return toOM(element, true);
+        OMXMLParserWrapper builder = OMXMLBuilderFactory.createOMBuilder(element, true);
+        builder.detach();
+        return builder.getDocumentElement();
     }
-    
-    /**
-     * Convert DOM Element into a fully built OMElement
-     * @param element
-     * @param buildAll if true, full OM tree is immediately built. if false, caller is responsible 
-     * for building the tree and closing the parser.
-     * @return
-     * @throws Exception
-     */
-    public static OMElement toOM(Element element, boolean buildAll) throws Exception {
-
-        Source source = new DOMSource(element);
-
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        Result result = new StreamResult(baos);
-
-        Transformer xformer = TransformerFactory.newInstance().newTransformer();
-        xformer.transform(source, result);
-
-        ByteArrayInputStream is = new ByteArrayInputStream(baos.toByteArray());
-
-        OMXMLParserWrapper builder = OMXMLBuilderFactory.createOMBuilder(is);
-
-        OMElement omElement = builder.getDocumentElement();
-        if (buildAll) {
-            omElement.build();
-            builder.close();
-        }
-        return omElement;
-    }
-
 
     /**
      * Converts a given OMElement to a DOM Element.