svn commit: r1072272 - in /axis/axis2/java/core/branches/1_6: ./ modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter/JavaMethodsToMDCConverter.java

[veithen]

Author: veithen
Date: Sat Feb 19 09:11:12 2011
New Revision: 1072272

URL: http://svn.apache.org/viewvc?rev=1072272&view=rev
Log:
Merged r1072271 to the 1.6 branch.

Modified:
    axis/axis2/java/core/branches/1_6/   (props changed)
    
axis/axis2/java/core/branches/1_6/modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter/JavaMethodsToMDCConverter.java

Propchange: axis/axis2/java/core/branches/1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 19 09:11:12 2011
@@ -1 +1 @@
-/axis/axis2/java/core/trunk:1072077
+/axis/axis2/java/core/trunk:1072077,1072271

Modified: 
axis/axis2/java/core/branches/1_6/modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter/JavaMethodsToMDCConverter.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter/JavaMethodsToMDCConverter.java?rev=1072272&r1=1072271&r2=1072272&view=diff
==============================================================================
--- 
axis/axis2/java/core/branches/1_6/modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter/JavaMethodsToMDCConverter.java
 (original)
+++ 
axis/axis2/java/core/branches/1_6/modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter/JavaMethodsToMDCConverter.java
 Sat Feb 19 09:11:12 2011
@@ -28,7 +28,6 @@ import org.apache.axis2.jaxws.descriptio
 import org.apache.axis2.jaxws.description.builder.WebEndpointAnnot;
 import org.apache.axis2.jaxws.description.builder.WebMethodAnnot;
 import org.apache.axis2.jaxws.description.builder.WebResultAnnot;
-import sun.reflect.generics.reflectiveObjects.GenericArrayTypeImpl;
 
 import javax.jws.Oneway;
 import javax.jws.WebMethod;
@@ -39,6 +38,7 @@ import javax.xml.ws.RequestWrapper;
 import javax.xml.ws.ResponseWrapper;
 import javax.xml.ws.WebEndpoint;
 import java.lang.reflect.Constructor;
+import java.lang.reflect.GenericArrayType;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.lang.reflect.ParameterizedType;
@@ -347,7 +347,7 @@ public class JavaMethodsToMDCConverter {
             mdc.setReturnType(fullType);
         } else if (type instanceof Class) {
             mdc.setReturnType(((Class)type).getName());
-        } else if (type instanceof GenericArrayTypeImpl) {
+        } else if (type instanceof GenericArrayType) {
             mdc.setReturnType(type.getClass().getName());
         }
     }