gdaniels 2002/09/25 15:25:24
Modified: java/src/org/apache/axis/encoding
DeserializationContextImpl.java
java/test/encoding TestDeser1999.java TestDeser2000.java
TestDeser2001.java
Log:
Correctly use the in-scope default namespace to resolve QNames with no
prefixes (such as xsi:type="type").
This change smoked out three XML bugs in the deserialization tests,
which are now fixed.
This change will hopefully fix
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=12873
Revision Changes Path
1.64 +6 -9
xml-axis/java/src/org/apache/axis/encoding/DeserializationContextImpl.java
Index: DeserializationContextImpl.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/encoding/DeserializationContextImpl.java,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- DeserializationContextImpl.java 18 Sep 2002 16:10:37 -0000 1.63
+++ DeserializationContextImpl.java 25 Sep 2002 22:25:24 -0000 1.64
@@ -328,15 +328,12 @@
// OK, this is a QName, so look up the prefix in our current mappings.
int i = qNameStr.indexOf(':');
- if (i == -1)
- return null;
-
- String nsURI = getNamespaceURI(qNameStr.substring(0, i));
-
- //log.debug("namespace = " + nsURI);
-
- if (nsURI == null)
- return null;
+ String nsURI;
+ if (i == -1) {
+ nsURI = getNamespaceURI("");
+ } else {
+ nsURI = getNamespaceURI(qNameStr.substring(0, i));
+ }
return new QName(nsURI, qNameStr.substring(i + 1));
}
1.7 +1 -1 xml-axis/java/test/encoding/TestDeser1999.java
Index: TestDeser1999.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/encoding/TestDeser1999.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TestDeser1999.java 27 Jun 2002 23:10:36 -0000 1.6
+++ TestDeser1999.java 25 Sep 2002 22:25:24 -0000 1.7
@@ -24,7 +24,7 @@
"<key xsi:null=\"true\"/>" +
"<value xsi:type=\"xsd:boolean\">false</value>" +
"</item><item>" +
- "<key xsi:type=\"string\">hi</key>" +
+ "<key xsi:type=\"xsd:string\">hi</key>" +
"<value xsi:null=\"true\"/>" +
"</item>" +
"</result>",
1.7 +1 -1 xml-axis/java/test/encoding/TestDeser2000.java
Index: TestDeser2000.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/encoding/TestDeser2000.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TestDeser2000.java 27 Jun 2002 23:10:36 -0000 1.6
+++ TestDeser2000.java 25 Sep 2002 22:25:24 -0000 1.7
@@ -24,7 +24,7 @@
"<key xsi:null=\"true\"/>" +
"<value xsi:type=\"xsd:boolean\">false</value>" +
"</item><item>" +
- "<key xsi:type=\"string\">hi</key>" +
+ "<key xsi:type=\"xsd:string\">hi</key>" +
"<value xsi:null=\"true\"/>" +
"</item>" +
"</result>",
1.25 +1 -1 xml-axis/java/test/encoding/TestDeser2001.java
Index: TestDeser2001.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/encoding/TestDeser2001.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- TestDeser2001.java 15 Sep 2002 19:16:17 -0000 1.24
+++ TestDeser2001.java 25 Sep 2002 22:25:24 -0000 1.25
@@ -250,7 +250,7 @@
"<key xsi:nil=\"true\"/>" +
"<value xsi:type=\"xsd:boolean\">false</value>" +
"</item><item>" +
- "<key xsi:type=\"string\">hi</key>" +
+ "<key xsi:type=\"xsd:string\">hi</key>" +
"<value xsi:nil=\"true\"/>" +
"</item>" +
"</result>",
