ws-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From veit...@apache.org
Subject svn commit: r1324577 - in /webservices/axiom/branches/AXIOM-412: ./ modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java
Date Wed, 11 Apr 2012 06:07:25 GMT
Author: veithen
Date: Wed Apr 11 06:07:25 2012
New Revision: 1324577

URL: http://svn.apache.org/viewvc?rev=1324577&view=rev
Log:
Merged latest changes from trunk.

Modified:
    webservices/axiom/branches/AXIOM-412/   (props changed)
    webservices/axiom/branches/AXIOM-412/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java

Propchange: webservices/axiom/branches/AXIOM-412/
------------------------------------------------------------------------------
  Merged /webservices/commons/trunk/modules/axiom:r1311658-1324576

Modified: webservices/axiom/branches/AXIOM-412/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-412/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java?rev=1324577&r1=1324576&r2=1324577&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-412/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java
(original)
+++ webservices/axiom/branches/AXIOM-412/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java
Wed Apr 11 06:07:25 2012
@@ -686,11 +686,7 @@ public class ElementImpl extends ParentN
             }
         }
 
-        if (attr.getNamespace() != null) { // If the attr has a namespace
-            this.setAttributeNodeNS((Attr) attr);
-        } else {
-            this.setAttributeNode((Attr) attr);
-        }
+        this.setAttributeNodeNS((Attr) attr);
         return attr;
     }
 



Mime
View raw message