svn commit: r391520 - in /webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl: dom/ElementImpl.java llom/OMElementImpl.java

[chinthaka]

Author: chinthaka
Date: Tue Apr  4 22:27:40 2006
New Revision: 391520

URL: http://svn.apache.org/viewcvs?rev=391520&view=rev
Log:
Improving performance.

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

Modified: 
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/dom/ElementImpl.java
URL: 
http://svn.apache.org/viewcvs/webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/dom/ElementImpl.java?rev=391520&r1=391519&r2=391520&view=diff
==============================================================================
--- 
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/dom/ElementImpl.java
 (original)
+++ 
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/dom/ElementImpl.java
 Tue Apr  4 22:27:40 2006
@@ -25,7 +25,6 @@
 import org.apache.axiom.om.OMText;
 import org.apache.axiom.om.OMXMLParserWrapper;
 import org.apache.axiom.om.impl.OMNodeEx;
-import org.apache.axiom.om.impl.MTOMXMLStreamWriter;
 import org.apache.axiom.om.impl.builder.StAXOMBuilder;
 import org.apache.axiom.om.impl.dom.factory.OMDOMFactory;
 import org.apache.axiom.om.impl.llom.OMSerializerUtil;
@@ -818,8 +817,9 @@
             while (namespaceListIterator.hasNext()) {
                 OMNamespace omNamespace = (OMNamespace) namespaceListIterator
                         .next();
-                if (omNamespace.getName() != null
-                        && omNamespace.getName().equals(uri)) {
+                String nsURI = omNamespace.getName();
+                if (nsURI != null
+                        && nsURI.equals(uri)) {
                     return omNamespace;
                 }
             }

Modified: 
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/llom/OMElementImpl.java
URL: 
http://svn.apache.org/viewcvs/webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/llom/OMElementImpl.java?rev=391520&r1=391519&r2=391520&view=diff
==============================================================================
--- 
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/llom/OMElementImpl.java
 (original)
+++ 
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/llom/OMElementImpl.java
 Tue Apr  4 22:27:40 2006
@@ -29,7 +29,6 @@
 import org.apache.axiom.om.OMXMLParserWrapper;
 import org.apache.axiom.om.impl.OMContainerEx;
 import org.apache.axiom.om.impl.OMNodeEx;
-import org.apache.axiom.om.impl.MTOMXMLStreamWriter;
 import org.apache.axiom.om.impl.builder.StAXOMBuilder;
 import org.apache.axiom.om.impl.llom.util.EmptyIterator;
 import org.apache.axiom.om.impl.traverse.OMChildElementIterator;
@@ -403,29 +402,24 @@
 
             OMNamespace ns = null;
 
+            String nsUri;
+
             while (namespaceListIterator.hasNext()) {
                 OMNamespace omNamespace =
                         (OMNamespace) namespaceListIterator.next();
-                if (omNamespace.getName() != null &&
-                        omNamespace.getName().equals(uri)) {
-                    if (ns == null) {
-                        ns = omNamespace;
-                    } else
-                    if (omNamespace.getPrefix() == null || 
omNamespace.getPrefix().length() == 0) {
-                        ns = omNamespace;
-
-                    }
+                nsUri = omNamespace.getName();
+                if (nsUri != null &&
+                        nsUri.equals(uri)) {
+                    return omNamespace;
                 }
             }
-            return ns;
         } else {
             OMNamespace namespace = (OMNamespace) namespaces.get(prefix);
             if (namespace != null && 
uri.equalsIgnoreCase(namespace.getName())) {
                 return namespace;
-            } else {
-                return null;
             }
         }
+        return null;
     }