cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/modules/generators Jdk12Interceptor.java

[costin]

costin      01/07/19 14:44:24

  Modified:    src/share/org/apache/tomcat/modules/generators
                        Jdk12Interceptor.java
  Log:
  Second part of the 2696 fix.
  
  Revision  Changes    Path
  1.5       +9 -2      
jakarta-tomcat/src/share/org/apache/tomcat/modules/generators/Jdk12Interceptor.java
  
  Index: Jdk12Interceptor.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/generators/Jdk12Interceptor.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Jdk12Interceptor.java     2001/03/31 22:32:05     1.4
  +++ Jdk12Interceptor.java     2001/07/19 21:44:24     1.5
  @@ -89,12 +89,17 @@
       {
        fixJDKContextClassLoader(ctx);
       }
  +
  +    public void postServletDestroy( Context ctx, Handler sw )
  +     throws TomcatException
  +    {
  +     jdk11Compat.setContextClassLoader(this.getClass().getLoader());
  +    }
       
       public void postServletInit( Context ctx, Handler sw )
        throws TomcatException
       {
  -     // no need to change the cl - next requst will do that
  -     // ( it's per-thread information )
  +     jdk11Compat.setContextClassLoader(this.getClass().getLoader());
       }
       
       /** Called before service method is invoked. 
  @@ -119,6 +124,8 @@
        request=child.getParent();
        if( request != null )
            fixJDKContextClassLoader(request.getContext());
  +     else
  +         jdk11Compat.setContextClassLoader(this.getClass().getLoader());
        return 0;
       }