tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From craig...@apache.org
Subject cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core StandardWrapper.java
Date Wed, 09 May 2001 23:54:14 GMT
craigmcc    01/05/09 16:54:14

  Modified:    catalina/src/share/org/apache/catalina/core
                        StandardWrapper.java
  Log:
  Clean up NPE at shutdown time caused by the fact that "loader" was not
  initialized.
  
  Revision  Changes    Path
  1.21      +5 -5      jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardWrapper.java
  
  Index: StandardWrapper.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardWrapper.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- StandardWrapper.java	2001/05/09 06:56:14	1.20
  +++ StandardWrapper.java	2001/05/09 23:54:13	1.21
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardWrapper.java,v
1.20 2001/05/09 06:56:14 remm Exp $
  - * $Revision: 1.20 $
  - * $Date: 2001/05/09 06:56:14 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardWrapper.java,v
1.21 2001/05/09 23:54:13 craigmcc Exp $
  + * $Revision: 1.21 $
  + * $Date: 2001/05/09 23:54:13 $
    *
    * ====================================================================
    *
  @@ -104,7 +104,7 @@
    * make them efficient are counter-productive.
    *
    * @author Craig R. McClanahan
  - * @version $Revision: 1.20 $ $Date: 2001/05/09 06:56:14 $
  + * @version $Revision: 1.21 $ $Date: 2001/05/09 23:54:13 $
    */
   
   public final class StandardWrapper
  @@ -969,7 +969,7 @@
           
           ClassLoader oldCtxClassLoader = 
               Thread.currentThread().getContextClassLoader();
  -        ClassLoader classLoader = loader.getClassLoader();
  +        ClassLoader classLoader = instance.getClass().getClassLoader();
   
   	// Call the servlet destroy() method
   	try {
  
  
  

Mime
View raw message