cvs commit: cocoon-2.1/src/java/org/apache/cocoon/servlet ParanoidCocoonServlet.java

[cziegeler]

cziegeler    2003/08/06 22:57:18

  Modified:    src/java/org/apache/cocoon/servlet
                        ParanoidCocoonServlet.java
  Log:
  Resetting class loader after the servlet is destroyed
  
  Revision  Changes    Path
  1.7       +8 -3      
cocoon-2.1/src/java/org/apache/cocoon/servlet/ParanoidCocoonServlet.java
  
  Index: ParanoidCocoonServlet.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/servlet/ParanoidCocoonServlet.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ParanoidCocoonServlet.java        1 Aug 2003 12:45:05 -0000       1.6
  +++ ParanoidCocoonServlet.java        7 Aug 2003 05:57:17 -0000       1.7
  @@ -263,8 +263,13 @@
         */
        public void destroy() {
   
  -             Thread.currentThread().setContextClassLoader(this.classloader);
  -             this.servlet.destroy();
  +        final ClassLoader old = 
Thread.currentThread().getContextClassLoader();
  +        try {
  +            Thread.currentThread().setContextClassLoader(this.classloader);
  +            this.servlet.destroy();
  +        } finally {
  +            Thread.currentThread().setContextClassLoader(old);    
  +        }
   
                super.destroy();
        }