tomj 2002/10/22 09:01:57
Modified: java/src/org/apache/axis/utils JavaUtils.java
Log:
Fix a problem in convert() when dealing with ArrayLists and add a test case.
The ArrayDeserializer produces an array of ArrayLists when deserializing a 2D
Object array. This is probably not the best, but that is some hairy code.
This fix just fixes convert() to deal with it correctly.
Note: It appears that we do some slow things in the Array stuff,
like converting things multiple times. This might be a good place for
performance work.
Revision Changes Path
1.82 +1 -0 xml-axis/java/src/org/apache/axis/utils/JavaUtils.java
Index: JavaUtils.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/utils/JavaUtils.java,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- JavaUtils.java 1 Oct 2002 21:41:47 -0000 1.81
+++ JavaUtils.java 22 Oct 2002 16:01:57 -0000 1.82
@@ -315,6 +315,7 @@
if (arg != null &&
destClass.isArray() &&
!destClass.getComponentType().equals(Object.class) &&
+ !destClass.getComponentType().isArray() &&
destClass.getComponentType().isAssignableFrom(arg.getClass())) {
Object array =
Array.newInstance(destClass.getComponentType(), 1);