scheu 02/03/08 11:13:01
Modified: java build.xml
java/src/org/apache/axis/encoding/ser ArraySerializer.java
Log:
Don't assume the type of List elements
Revision Changes Path
1.119 +1 -15 xml-axis/java/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-axis/java/build.xml,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- build.xml 28 Feb 2002 15:26:51 -0000 1.118
+++ build.xml 8 Mar 2002 19:13:01 -0000 1.119
@@ -328,6 +328,7 @@
<exclude name="test/lib/*.java"/>
<exclude name="test/inout/*.java" />
<exclude name="test/wsdl/*/*.java" />
+ <exclude name="test/wsdl/interop3/groupE/**/*.java" />
<exclude name="test/wsdl/interop3/**/*.java" />
<exclude name="test/wsdl/Wsdl2javaTestSuite.java" unless="servlet.present"/>
<exclude name="test/md5attach/*.java" unless="attachments.present"/>
@@ -516,25 +517,10 @@
</target>
<!-- =================================================================== -->
- <!-- Interop 3 -->
- <!-- =================================================================== -->
- <target name="interop3" depends="buildTest">
- <ant dir="test/wsdl/interop3/import1"/>
- <ant dir="test/wsdl/interop3/import2"/>
- <ant dir="test/wsdl/interop3/import3"/>
- <ant dir="test/wsdl/interop3/compound1"/>
- <ant dir="test/wsdl/interop3/compound2"/>
- <ant dir="test/wsdl/interop3/docLit"/>
- <ant dir="test/wsdl/interop3/docLitParam"/>
- <ant dir="test/wsdl/interop3/rpcEnc"/>
- </target>
-
- <!-- =================================================================== -->
<!-- Cleans everything -->
<!-- =================================================================== -->
<target name="clean">
<delete dir="${build.dir}"/>
- <delete dir="${test.dir}/build"/>
<delete dir="${dist.dir}"/>
<delete file="client-config.wsdd"/>
<delete file="server-config.wsdd"/>
1.14 +2 -6
xml-axis/java/src/org/apache/axis/encoding/ser/ArraySerializer.java
Index: ArraySerializer.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/encoding/ser/ArraySerializer.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ArraySerializer.java 26 Feb 2002 22:59:30 -0000 1.13
+++ ArraySerializer.java 8 Mar 2002 19:13:01 -0000 1.14
@@ -133,11 +133,7 @@
if (list == null) {
componentType = cls.getComponentType();
} else {
- if (list.isEmpty()) {
- componentType = Object.class;
- } else {
- componentType = list.get(0).getClass();
- }
+ componentType = Object.class;
}
// Check to see if componentType is also an array.
@@ -186,7 +182,7 @@
// More complicated processing is necessary for 3-dim arrays, etc.
//
int dim2Len = -1;
- boolean enable2Dim = true; // Disabled
+ boolean enable2Dim = true; // Enabled 2-Dim processing
if (enable2Dim && !dims.equals("")) {
if (cls.isArray() && len > 0) {
boolean okay = true;
