cvs commit: xml-axis/java/src/org/apache/axis/wsdl/symbolTable SymbolTable.java

[dims]

dims        2002/11/30 16:03:42

  Modified:    java/src/org/apache/axis/i18n resource.properties
               java/src/org/apache/axis/wsdl/symbolTable SymbolTable.java
  Log:
  Fix for Bug 13901 - Null pointer exception occurred while parsing WSDL
  
  Notes:
  - Am throwing exception with information instead of NPE.
  - SOAP:Array in lu.wsdl mentioned in bug report is incorrect (should be 
SOAP-ENC:Array)
  
  Revision  Changes    Path
  1.33      +1 -0      xml-axis/java/src/org/apache/axis/i18n/resource.properties
  
  Index: resource.properties
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/i18n/resource.properties,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- resource.properties       20 Nov 2002 20:05:30 -0000      1.32
  +++ resource.properties       1 Dec 2002 00:03:42 -0000       1.33
  @@ -1037,6 +1037,7 @@
   badNonNegInt00=Invalid nonNegativeInteger
   undefinedElem00=Element {0} is referenced but not defined.
   emptyref00=Error: missing type or ref attribute for node ''{0}''
  +absentRef00=Error: Cannot find referenced type ''{0}'' for type ''{1}''
   
   cannotConnectError=Unable to connect
   
  
  
  
  1.55      +3 -0      
xml-axis/java/src/org/apache/axis/wsdl/symbolTable/SymbolTable.java
  
  Index: SymbolTable.java
  ===================================================================
  RCS file: 
/home/cvs/xml-axis/java/src/org/apache/axis/wsdl/symbolTable/SymbolTable.java,v
  retrieving revision 1.54
  retrieving revision 1.55
  diff -u -r1.54 -r1.55
  --- SymbolTable.java  30 Nov 2002 03:55:11 -0000      1.54
  +++ SymbolTable.java  1 Dec 2002 00:03:42 -0000       1.55
  @@ -820,6 +820,9 @@
   
                   // Now get the TypeEntry
                   TypeEntry refType = getTypeEntry(refQName, forElement.value);
  +                if (refType == null) {
  +                    throw new IOException(Messages.getMessage("absentRef00", 
refQName.toString(), qName.toString()));
  +                }
   
                   if (!belowSchemaLevel) {
                       symbolTablePut(new DefinedElement(qName, refType, node, ""));