You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by ru...@apache.org on 2002/08/19 14:12:08 UTC
cvs commit: xml-axis/java/src/org/apache/axis/message RPCHandler.java
rubys 2002/08/19 05:12:08
Modified: java/src/org/apache/axis/encoding
DeserializationContextImpl.java
DeserializerImpl.java
java/src/org/apache/axis/encoding/ser MapDeserializer.java
VectorDeserializer.java
java/src/org/apache/axis/message RPCHandler.java
Log:
Check for nil consistently. Prior to this change, only
encoding/DeserializerImpl.java did this check correctly.
Revision Changes Path
1.47 +1 -1 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.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- DeserializationContextImpl.java 18 Aug 2002 13:59:29 -0000 1.46
+++ DeserializationContextImpl.java 19 Aug 2002 12:12:08 -0000 1.47
@@ -402,7 +402,7 @@
*/
public boolean isNil(Attributes attrs) {
return JavaUtils.isTrueExplicitly(
- Constants.getValue(attrs, Constants.URIS_SCHEMA_XSI, "nil"),
+ Constants.getValue(attrs, Constants.QNAMES_NIL),
false);
}
1.27 +1 -2 xml-axis/java/src/org/apache/axis/encoding/DeserializerImpl.java
Index: DeserializerImpl.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/DeserializerImpl.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- DeserializerImpl.java 12 Aug 2002 22:35:56 -0000 1.26
+++ DeserializerImpl.java 19 Aug 2002 12:12:08 -0000 1.27
@@ -321,8 +321,7 @@
// If the nil attribute is present and true, set the value to null
// and return since there is nothing to deserialize.
- if (JavaUtils.isTrueExplicitly(Constants.getValue(attributes,
- Constants.QNAMES_NIL))) {
+ if (context.isNil(attributes)) {
value = null;
isNil = true;
return;
1.18 +1 -1 xml-axis/java/src/org/apache/axis/encoding/ser/MapDeserializer.java
Index: MapDeserializer.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/ser/MapDeserializer.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- MapDeserializer.java 3 Aug 2002 21:25:25 -0000 1.17
+++ MapDeserializer.java 19 Aug 2002 12:12:08 -0000 1.18
@@ -112,7 +112,7 @@
log.debug("Enter MapDeserializer::startElement()");
}
- if (attributes.getValue(Constants.URI_DEFAULT_SCHEMA_XSI, "nil") != null) {
+ if (context.isNil(attributes)) {
return;
}
1.17 +1 -1 xml-axis/java/src/org/apache/axis/encoding/ser/VectorDeserializer.java
Index: VectorDeserializer.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/ser/VectorDeserializer.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- VectorDeserializer.java 3 Aug 2002 21:25:25 -0000 1.16
+++ VectorDeserializer.java 19 Aug 2002 12:12:08 -0000 1.17
@@ -105,7 +105,7 @@
log.debug("Enter: VectorDeserializer::startElement()");
}
- if (attributes.getValue(Constants.URI_DEFAULT_SCHEMA_XSI, "nil") != null) {
+ if (context.isNil(attributes)) {
return;
}
1.57 +1 -2 xml-axis/java/src/org/apache/axis/message/RPCHandler.java
Index: RPCHandler.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/message/RPCHandler.java,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- RPCHandler.java 12 Aug 2002 22:58:47 -0000 1.56
+++ RPCHandler.java 19 Aug 2002 12:12:08 -0000 1.57
@@ -252,8 +252,7 @@
// so that a list of 3 items is created.
// Failure to register the target would result in the last
// item not being added to the list
- if (JavaUtils.isTrueExplicitly(
- attributes.getValue(Constants.URI_2001_SCHEMA_XSI, "nil"))) {
+ if (context.isNil(attributes)) {
Deserializer nilDSer = new DeserializerImpl();
nilDSer.registerValueTarget(
new MethodTarget(currentParam,