You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commons-dev@ws.apache.org by ru...@apache.org on 2007/07/16 08:38:47 UTC

svn commit: r556521 - in /webservices/commons/trunk/modules/axiom/modules: axiom-api/src/main/java/org/apache/axiom/om/impl/builder/ axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/

Author: ruchithf
Date: Sun Jul 15 23:38:45 2007
New Revision: 556521

URL: http://svn.apache.org/viewvc?view=rev&rev=556521
Log:
Fixed the issue that caused this : http://thread.gmane.org/gmane.text.xml.security.devel/5825

Modified:
    webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/StAXOMBuilder.java
    webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DOMStAXWrapper.java
    webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMStAXWrapper.java

Modified: webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/StAXOMBuilder.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/StAXOMBuilder.java?view=diff&rev=556521&r1=556520&r2=556521
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/StAXOMBuilder.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/StAXOMBuilder.java Sun Jul 15 23:38:45 2007
@@ -362,7 +362,7 @@
             if (nsprefix == null || "".equals(nsprefix)) {
                 node.declareDefaultNamespace(parser.getNamespaceURI(i));
             } else {
-                node.declareNamespace(namespaceURIFromParser, nsprefix);
+                node.declareNamespace(namespaceURIFromParser.intern(), nsprefix);
             }
         }
 
@@ -370,9 +370,9 @@
             OMNamespace namespace = node.findNamespace(namespaceURI, prefix);
             if (namespace == null || (!namespace.getPrefix().equals(prefix))) {
                 if (prefix == null || "".equals(prefix)) {
-                    namespace = node.declareDefaultNamespace(namespaceURI);
+                    namespace = node.declareDefaultNamespace(namespaceURI.intern());
                 } else {
-                    namespace = node.declareNamespace(namespaceURI, prefix);
+                    namespace = node.declareNamespace(namespaceURI.intern(), prefix);
                 }
             }
             node.setNamespaceWithNoFindInCurrentScope(namespace);

Modified: webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DOMStAXWrapper.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DOMStAXWrapper.java?view=diff&rev=556521&r1=556520&r2=556521
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DOMStAXWrapper.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DOMStAXWrapper.java Sun Jul 15 23:38:45 2007
@@ -208,7 +208,7 @@
                 returnStr = (ns == null) ? null : ns.getNamespaceURI();
             }
         }
-        return returnStr;
+        return (returnStr != null) ? returnStr.intern() : null;
     }
 
     /**

Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMStAXWrapper.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMStAXWrapper.java?view=diff&rev=556521&r1=556520&r2=556521
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMStAXWrapper.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMStAXWrapper.java Sun Jul 15 23:38:45 2007
@@ -215,7 +215,7 @@
                         : ns.getNamespaceURI();
             }
         }
-        return returnStr;
+        return (returnStr != null) ? returnStr.intern() : null;
     }
 
     /**



---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: commons-dev-help@ws.apache.org