cvs commit: jakarta-tomcat/src/facade22/org/apache/tomcat/facade ServletHandler.java

[larryi]

larryi      01/09/14 05:09:27

  Modified:    src/facade22/org/apache/tomcat/facade ServletHandler.java
  Log:
  Avoid NPE.
  
  Submitted by: Bojan Smojver <[EMAIL PROTECTED]>
  
  Revision  Changes    Path
  1.16      +1 -1      
jakarta-tomcat/src/facade22/org/apache/tomcat/facade/ServletHandler.java
  
  Index: ServletHandler.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat/src/facade22/org/apache/tomcat/facade/ServletHandler.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- ServletHandler.java       2001/07/19 18:03:15     1.15
  +++ ServletHandler.java       2001/09/14 12:09:27     1.16
  @@ -158,7 +158,7 @@
        servlet=null; // reset the servlet, if it was set
        servletClass=null;
        this.servletClassName=servletClassName;
  -     if( debug>0 && sw.getJspFile()!=null)
  +     if( debug>0 && sw!=null && sw.getJspFile()!=null)
            log( context, "setServletClassName for " + sw.getJspFile() +
                 ": " + servletClassName);
       }