svn commit: r1164997 - /webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java

[ve...@apache.org]

Author: veithen
Date: Sun Sep  4 11:29:35 2011
New Revision: 1164997

URL: http://svn.apache.org/viewvc?rev=1164997&view=rev
Log:
AXIOM-240: Reverted part of r688927: XOP no longer requires special attention since AXIOM-255 and AXIOM-335 have been fixed.

Modified:
    webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java

Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java?rev=1164997&r1=1164996&r2=1164997&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java Sun Sep  4 11:29:35 2011
@@ -19,7 +19,6 @@
 
 package org.apache.axiom.om.impl.llom;
 
-import org.apache.axiom.attachments.Attachments;
 import org.apache.axiom.om.OMAttribute;
 import org.apache.axiom.om.OMConstants;
 import org.apache.axiom.om.OMContainer;
@@ -31,12 +30,9 @@ import org.apache.axiom.om.OMNode;
 import org.apache.axiom.om.OMSourcedElement;
 import org.apache.axiom.om.OMText;
 import org.apache.axiom.om.OMXMLParserWrapper;
-import org.apache.axiom.om.OMXMLStreamReader;
 import org.apache.axiom.om.impl.OMContainerEx;
 import org.apache.axiom.om.impl.OMNodeEx;
 import org.apache.axiom.om.impl.builder.StAXOMBuilder;
-import org.apache.axiom.om.impl.builder.XOPAwareStAXOMBuilder;
-import org.apache.axiom.om.impl.builder.XOPBuilder;
 import org.apache.axiom.om.impl.common.OMNamespaceImpl;
 import org.apache.axiom.om.impl.jaxp.OMSource;
 import org.apache.axiom.om.impl.llom.factory.OMLinkedListImplFactory;
@@ -1077,28 +1073,9 @@ public class OMElementImpl extends OMNod
             log.debug("  reader = " + xmlStreamReader);
         }
         
-        // Get a new builder.  Use an xop aware builder if the original
-        // builder is xop aware
-        StAXOMBuilder newBuilder = null;
-        if (builder instanceof XOPBuilder) {
-            Attachments attachments = ((XOPBuilder)builder).getAttachments();
-            attachments.getAllContentIDs();
-            if (xmlStreamReader instanceof OMXMLStreamReader) {
-                if (log.isDebugEnabled()) {
-                    log.debug("  read optimized xop:include");
-                }
-                ((OMXMLStreamReader)xmlStreamReader).setInlineMTOM(false);
-            }
-            newBuilder = new XOPAwareStAXOMBuilder(xmlStreamReader, attachments);
-        } else {
-            newBuilder = new StAXOMBuilder(xmlStreamReader);
-        }
-        if (log.isDebugEnabled()) {
-            log.debug("  newBuilder = " + newBuilder);
-        }
-        
         // Build the (target) clonedElement from the parser
-        OMElement clonedElement = newBuilder.getDocumentElement();
+        OMElement clonedElement =
+                new StAXOMBuilder(xmlStreamReader).getDocumentElement();
         clonedElement.build();
         return clonedElement;
     }