ws-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From veit...@apache.org
Subject svn commit: r1484168 - /webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/Navigator.java
Date Sat, 18 May 2013 19:33:49 GMT
Author: veithen
Date: Sat May 18 19:33:49 2013
New Revision: 1484168

URL: http://svn.apache.org/r1484168
Log:
Removed an old workaround for WSTX-57 which has long been fixed.

Modified:
    webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/Navigator.java

Modified: webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/Navigator.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/Navigator.java?rev=1484168&r1=1484167&r2=1484168&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/Navigator.java
(original)
+++ webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/Navigator.java
Sat May 18 19:33:49 2013
@@ -375,28 +375,10 @@ final class Navigator extends PullSerial
     }
     
     String getNamespaceURI(int i) {
-        if (parser != null) {
-            String uri = parser.getNamespaceURI(i);
-
-            /*
-              The following line is necessary to overcome an issue where the empty
-              namespace URI returning null rather than the empty string. Our resolution
-              is to return "" if the return is actually null
-
-              Note that this is not the case for  getNamespaceURI(prefix) method
-              where the contract clearly specifies that the return may be null
-
-            */
-            if (uri == null) {
-                uri = "";
-            }
-            return uri;
+        if (currentEvent == START_ELEMENT || currentEvent == END_ELEMENT) {
+            return getNamespace(i).getNamespaceURI();
         } else {
-            if (currentEvent == START_ELEMENT || currentEvent == END_ELEMENT) {
-                return getNamespace(i).getNamespaceURI();
-            } else {
-                throw new IllegalStateException();
-            }
+            throw new IllegalStateException();
         }
     }
 



Mime
View raw message