cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler Generator.java

[luehe]

luehe       2002/08/02 14:13:34

  Modified:    jasper2/src/share/org/apache/jasper/compiler Generator.java
  Log:
  Fixed NPE in generateELFunctionMap()
  
  Revision  Changes    Path
  1.60      +4 -4      
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java
  
  Index: Generator.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java,v
  retrieving revision 1.59
  retrieving revision 1.60
  diff -u -r1.59 -r1.60
  --- Generator.java    2 Aug 2002 19:30:02 -0000       1.59
  +++ Generator.java    2 Aug 2002 21:13:33 -0000       1.60
  @@ -525,7 +525,7 @@
           while( iter.hasNext() ) {
               String key = (String)iter.next();
               TagLibraryInfo tli = (TagLibraryInfo)taglibs.get( key );
  -            if( tli.getFunctions().length > 0 ) {
  +            if( tli.getFunctions() != null && tli.getFunctions().length > 0 ) {
                   fnPresent = true;
                   break;
               }
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>