You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by di...@apache.org on 2005/05/04 23:30:20 UTC
cvs commit: ws-axis/java/src/org/apache/axis/encoding TypeMappingImpl.java
dims 2005/05/04 14:30:20
Modified: java/src/org/apache/axis/encoding TypeMappingImpl.java
Log:
Prevent NPE - part of AXIS-1973
Revision Changes Path
1.64 +2 -2 ws-axis/java/src/org/apache/axis/encoding/TypeMappingImpl.java
Index: TypeMappingImpl.java
===================================================================
RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/encoding/TypeMappingImpl.java,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- TypeMappingImpl.java 28 Apr 2005 04:08:29 -0000 1.63
+++ TypeMappingImpl.java 4 May 2005 21:30:20 -0000 1.64
@@ -462,10 +462,10 @@
if (xmlType != null) {
Class actualClass = start.getClassForQName(xmlType);
if (actualClass == componentType ||
- componentType.isAssignableFrom(actualClass))
+ (actualClass != null && componentType.isAssignableFrom(actualClass))) {
return null;
+ }
}
-
Pair pair = (Pair) qName2Pair.get(Constants.SOAP_ARRAY);
df = (DeserializerFactory) pair2DF.get(pair);
if (df instanceof ArrayDeserializerFactory && javaType.isArray()) {