You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by be...@locus.apache.org on 2000/01/18 04:48:45 UTC

cvs commit: jakarta-tomcat/src/share/org/apache/jasper/runtime JspServlet.java

bergsten    00/01/17 19:48:45

  Modified:    src/share/org/apache/jasper/runtime JspServlet.java
  Log:
  Fixed a NPE in a debug printout, caused by the fact that getClass().getClassLoader()
  returns null with JDK 1.1.6 and JDK 1.1.8 (at least on Windows)
  
  Revision  Changes    Path
  1.13      +9 -1      jakarta-tomcat/src/share/org/apache/jasper/runtime/JspServlet.java
  
  Index: JspServlet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/runtime/JspServlet.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- JspServlet.java	1999/12/28 16:25:54	1.12
  +++ JspServlet.java	2000/01/18 03:48:45	1.13
  @@ -208,11 +208,19 @@
               if (parentClassLoader == null)
                   parentClassLoader = this.getClass().getClassLoader();
               
  +            // getClass().getClassLoader() returns null in JDK 1.1.6/1.1.8
  +            if (parentClassLoader != null) {
               Constants.message("jsp.message.parent_class_loader_is", 
                                 new Object[] {
                                     parentClassLoader.toString()
                                 }, Constants.MED_VERBOSITY);
  -
  +            }
  +            else {
  +            Constants.message("jsp.message.parent_class_loader_is", 
  +                              new Object[] {
  +                                  "<none>"
  +                              }, Constants.MED_VERBOSITY);
  +            }
               this.loader = new JspLoader(context, 
                                           parentClassLoader, 
                                           options);