gdaniels 02/03/27 12:16:25
Modified: java/src/org/apache/axis/client Call.java
java/src/org/apache/axis/encoding
DeserializationContextImpl.java
Log:
Two small bugs.
* Make sure to check the in-scope namespace mappings *before* asking
the current element in DeserializationContextImpl. This is because we
end up calling getNamespaceURI() during the string->QName conversion
for xsi:types in the constructor of MessageElement, when the element
being built is not actually (yet) the current element of the DeserContext.
* Parameters have been added in Call when getNumParams() is > 0, not
when operation == null.
Revision Changes Path
1.110 +1 -1 xml-axis/java/src/org/apache/axis/client/Call.java
Index: Call.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/client/Call.java,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- Call.java 27 Mar 2002 19:27:46 -0000 1.109
+++ Call.java 27 Mar 2002 20:16:25 -0000 1.110
@@ -1684,7 +1684,7 @@
* parameter types, check for this case right now and toss a fault
* if things don't look right.
*/
- if (operation != null && returnType == null) {
+ if (operation.getNumParams() > 0 && returnType == null) {
throw new AxisFault(JavaUtils.getMessage("mustSpecifyReturnType"));
}
1.21 +5 -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.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- DeserializationContextImpl.java 25 Mar 2002 16:12:16 -0000 1.20
+++ DeserializationContextImpl.java 27 Mar 2002 20:16:25 -0000 1.21
@@ -273,10 +273,14 @@
*/
public String getNamespaceURI(String prefix)
{
+ String result = namespaces.getNamespaceURI(prefix);
+ if (result != null)
+ return result;
+
if (curElement != null)
return curElement.getNamespaceURI(prefix);
- return namespaces.getNamespaceURI(prefix);
+ return null;
}
/**
