cvs commit: xml-axis/java/src/org/apache/axis/wsdl/fromJava Types.java

[tomj]

tomj        02/04/15 14:54:19

  Modified:    java/src/org/apache/axis/wsdl/fromJava Types.java
  Log:
  Remove special case of java.lang.Object so WSDL
  generation will correctly do Object[].
  
  Revision  Changes    Path
  1.21      +13 -15    xml-axis/java/src/org/apache/axis/wsdl/fromJava/Types.java
  
  Index: Types.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/fromJava/Types.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- Types.java        15 Apr 2002 19:50:08 -0000      1.20
  +++ Types.java        15 Apr 2002 21:54:19 -0000      1.21
  @@ -232,22 +232,20 @@
               qName != null &&
               Constants.equals(Constants.SOAP_ARRAY, qName)) {
               Class componentType = javaType.getComponentType();
  -            if (componentType != java.lang.Object.class) {
  -                // If component namespace uri == targetNamespace
  -                // Construct ArrayOf<componentLocalPart>
  -                // Else
  -                // Construct ArrayOf_<componentPrefix>_<componentLocalPart>
  -                javax.xml.rpc.namespace.QName cqName = getTypeQName(componentType);
  -                if (targetNamespace.equals(cqName.getNamespaceURI())) {
  -                    qName = new javax.xml.rpc.namespace.QName(
  -                         targetNamespace,
  -                         "ArrayOf" + cqName.getLocalPart());
  -                } else {                                     
  -                    String pre = 
namespaces.getCreatePrefix(cqName.getNamespaceURI());
  -                    qName = new javax.xml.rpc.namespace.QName(
  -                         targetNamespace,
  +            // If component namespace uri == targetNamespace
  +            // Construct ArrayOf<componentLocalPart>
  +            // Else
  +            // Construct ArrayOf_<componentPrefix>_<componentLocalPart>
  +            javax.xml.rpc.namespace.QName cqName = getTypeQName(componentType);
  +            if (targetNamespace.equals(cqName.getNamespaceURI())) {
  +                qName = new javax.xml.rpc.namespace.QName(
  +                        targetNamespace,
  +                        "ArrayOf" + cqName.getLocalPart());
  +            } else {                                     
  +                String pre = namespaces.getCreatePrefix(cqName.getNamespaceURI());
  +                qName = new javax.xml.rpc.namespace.QName(
  +                        targetNamespace,
                           "ArrayOf_" + pre + "_" + cqName.getLocalPart());
  -                }
               }
               return qName;
           }