Author: dkulp Date: Tue Nov 19 20:09:54 2013 New Revision: 1543557 URL: http://svn.apache.org/r1543557 Log: Merged revisions 1543554 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
........ r1543554 | dkulp | 2013-11-19 15:08:36 -0500 (Tue, 19 Nov 2013) | 10 lines Merged revisions 1543547 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1543547 | dkulp | 2013-11-19 14:45:22 -0500 (Tue, 19 Nov 2013) | 2 lines [CXF-5258] If a type is a collection, keep it as a collection type. ........ ........ Modified: cxf/branches/2.6.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/WrapperClassGenerator.java Modified: cxf/branches/2.6.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/WrapperClassGenerator.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/WrapperClassGenerator.java?rev=1543557&r1=1543556&r2=1543557&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/WrapperClassGenerator.java (original) +++ cxf/branches/2.6.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/WrapperClassGenerator.java Tue Nov 19 20:09:54 2013 @@ -321,6 +321,8 @@ public final class WrapperClassGenerator fieldDescriptor = getClassCode(genericType); } else if (types[0] instanceof GenericArrayType) { fieldDescriptor = getClassCode(genericType); + } else if (Collection.class.isAssignableFrom(clz)) { + fieldDescriptor = getClassCode(genericType); } else if (types[0] instanceof ParameterizedType) { classCode = getClassCode(((ParameterizedType)types[0]).getRawType()); fieldDescriptor = getClassCode(genericType);
