axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject cvs commit: xml-axis/java/src/org/apache/axis/description ServiceDesc.java
Date Thu, 05 Jun 2003 14:13:37 GMT
dims        2003/06/05 07:13:36

  Modified:    java/src/org/apache/axis/description ServiceDesc.java
  Log:
  Prevent NPE in case there are problems finding the paramClass
  
  Revision  Changes    Path
  1.77      +12 -10    xml-axis/java/src/org/apache/axis/description/ServiceDesc.java
  
  Index: ServiceDesc.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/description/ServiceDesc.java,v
  retrieving revision 1.76
  retrieving revision 1.77
  diff -u -r1.76 -r1.77
  --- ServiceDesc.java	28 Apr 2003 14:02:37 -0000	1.76
  +++ ServiceDesc.java	5 Jun 2003 14:13:36 -0000	1.77
  @@ -657,16 +657,18 @@
                               paramClass = tm.getClassForQName(param.getTypeQName());
                           }
   
  -                        // This is a match if the paramClass is somehow
  -                        // convertable to the "real" parameter type.  If not,
  -                        // break out of this loop.
  -                        if (!JavaUtils.isConvertable(paramClass, actualType)) {
  -                            break;
  -                        }
  -                        
  -                        if (!actualType.isAssignableFrom(paramClass)) {
  -                            // This doesn't fit without conversion
  -                            conversionNecessary = true;
  +                        if (paramClass != null) {
  +                            // This is a match if the paramClass is somehow
  +                            // convertable to the "real" parameter type.  If not,
  +                            // break out of this loop.
  +                            if (!JavaUtils.isConvertable(paramClass, actualType)) {
  +                                break;
  +                            }
  +                            
  +                            if (!actualType.isAssignableFrom(paramClass)) {
  +                                // This doesn't fit without conversion
  +                                conversionNecessary = true;
  +                            }
                           }
                       }
                       // In all scenarios the ParameterDesc javaType is set to
  
  
  

Mime
View raw message