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

[ve...@apache.org]

Author: veithen
Date: Thu Apr 26 05:32:40 2012
New Revision: 1330658

URL: http://svn.apache.org/viewvc?rev=1330658&view=rev
Log:
Removed unnecessary code. The namespace is actually already updated by the StAXOMBuilder constructor.

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

Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMSourcedElementImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMSourcedElementImpl.java?rev=1330658&r1=1330657&r2=1330658&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMSourcedElementImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMSourcedElementImpl.java Thu Apr 26 05:32:40 2012
@@ -301,38 +301,14 @@ public class OMSourcedElementImpl extend
                         readerURI + ", not the expected " + uri);
             }
 
-            // Get the current prefix and the reader's prefix
-            String readerPrefix = readerFromDS.getPrefix();
-            readerPrefix = (readerPrefix == null) ? "" : readerPrefix;
-            String prefix = null;
-            
-            OMNamespace ns = getNamespace();
-            if (ns == null || ns instanceof DeferredNamespace) {
-                // prefix is not available until after expansion
-            } else {
-                prefix = ns.getPrefix();
-            }
-            
-            // Set the builder for this element
+            // Set the builder for this element. Note that the StAXOMBuilder constructor will also
+            // update the namespace of the element, so we don't need to do that here.
             isExpanded = true;
             super.setBuilder(new StAXOMBuilder(getOMFactory(), 
                                                readerFromDS, 
                                                this, 
                                                characterEncoding));
             setComplete(false);
-
-            // Update the prefix if necessary.  This must be done after
-            // isParserSet to avoid a recursive call
-            if (!readerPrefix.equals(prefix) ||
-                 getNamespace() == null ||
-                 ns instanceof DeferredNamespace) {
-                if (log.isDebugEnabled()) {
-                    log.debug(
-                            "forceExpand: changing prefix from " + prefix + " to " + readerPrefix);
-                }
-                setNamespace(new OMNamespaceImpl(readerURI, readerPrefix));
-            }
-
         }
     }