axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From g...@apache.org
Subject cvs commit: xml-axis/java/test/utils TestSrcContent.java
Date Mon, 01 Jul 2002 09:29:43 GMT
glyn        2002/07/01 02:29:43

  Modified:    java     TODO.txt
               java/src/org/apache/axis/description TypeDesc.java
               java/src/org/apache/axis/wsdl/fromJava Emitter.java
               java/test/utils TestSrcContent.java
  Log:
  Fix bugzilla 9987.
  
  (Also tweak Emitter.java to pinpoint intermittent NPE in Java2Wsdl.)
  
  Revision  Changes    Path
  1.65      +1 -1      xml-axis/java/TODO.txt
  
  Index: TODO.txt
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/TODO.txt,v
  retrieving revision 1.64
  retrieving revision 1.65
  diff -u -r1.64 -r1.65
  --- TODO.txt	1 Jul 2002 03:17:50 -0000	1.64
  +++ TODO.txt	1 Jul 2002 09:29:43 -0000	1.65
  @@ -49,7 +49,7 @@
   X 9952 - must - Glyn
   _ 9966 - nice - Tom (like 9717)
   _ 9967 - nice - Tom (like 9717 and 9966)
  -M 9987 - must - Glen
  +X 9987 - must - Glyn
   X 9992 - must - dims
   _ 10003 - post
   
  
  
  
  1.16      +1 -5      xml-axis/java/src/org/apache/axis/description/TypeDesc.java
  
  Index: TypeDesc.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/description/TypeDesc.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- TypeDesc.java	20 Jun 2002 16:48:18 -0000	1.15
  +++ TypeDesc.java	1 Jul 2002 09:29:43 -0000	1.16
  @@ -180,11 +180,7 @@
       public void addFieldDesc(FieldDesc field)
       {
           if (field == null) {
  -            //XXX TypeDesc is published and should not throw NPEs
  -            // An exception has been coded in the source code checks
  -            // in test.utils.TestSrcContent which should be removed
  -            // when this NPE is removed.
  -            throw new NullPointerException(
  +            throw new IllegalArgumentException(
                       JavaUtils.getMessage("nullFieldDesc"));
           }
           
  
  
  
  1.46      +3 -1      xml-axis/java/src/org/apache/axis/wsdl/fromJava/Emitter.java
  
  Index: Emitter.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/fromJava/Emitter.java,v
  retrieving revision 1.45
  retrieving revision 1.46
  diff -u -r1.45 -r1.46
  --- Emitter.java	28 Jun 2002 23:27:25 -0000	1.45
  +++ Emitter.java	1 Jul 2002 09:29:43 -0000	1.46
  @@ -584,7 +584,9 @@
           portType.setUndefined(false);
   
           // PortType name is the name of the class being processed
  -        portType.setQName(new QName(intfNS, getPortTypeName()));
  +        // Split statement to isolate NPE
  +        QName tempqn = new QName(intfNS, getPortTypeName());
  +        portType.setQName(tempqn);
   
           ArrayList operations = serviceDesc.getOperations();
           for (Iterator i = operations.iterator(); i.hasNext();) {
  
  
  
  1.9       +0 -2      xml-axis/java/test/utils/TestSrcContent.java
  
  Index: TestSrcContent.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/utils/TestSrcContent.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- TestSrcContent.java	20 Jun 2002 15:17:56 -0000	1.8
  +++ TestSrcContent.java	1 Jul 2002 09:29:43 -0000	1.9
  @@ -204,11 +204,9 @@
                                          false),
   
               // Verify that we don't explicitly create NPEs.
  -            // NPE in TypeDesc needs removing.
   
               new FileNameContentPattern(".+([\\\\/])"
                                          + "java\\1src\\1org\\1apache\\1axis\\1"
  -                                       + "(?!description\\1TypeDesc\\.java)"
                                          + "([a-zA-Z0-9_]+\\1)*"
                                          + "[^\\\\/]+\\.java",
                                          "new[ \\t]+"
  
  
  

Mime
View raw message