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

[nacho]

nacho       01/04/27 14:45:41

  Modified:    src/facade22/org/apache/tomcat/facade JspInterceptor.java
  Log:
  JspInterceptor compilation class path was wrong
  
  Submitted by William Barker wbarker at wilshire.com
  
  Revision  Changes    Path
  1.21      +6 -5      
jakarta-tomcat/src/facade22/org/apache/tomcat/facade/JspInterceptor.java
  
  Index: JspInterceptor.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat/src/facade22/org/apache/tomcat/facade/JspInterceptor.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- JspInterceptor.java       2001/04/21 19:54:34     1.20
  +++ JspInterceptor.java       2001/04/27 21:45:40     1.21
  @@ -732,12 +732,13 @@
           String cpath = "";
           cpath+=extractClassPath(classP);
           Jdk11Compat jdkProxy=Jdk11Compat.getJdkCompat();
  -        URL serverCP[];
  +        URL appsCP[];
           URL commonCP[];
  -        serverCP=jdkProxy.getParentURLs(this.getClass().getClassLoader());
  -        commonCP=jdkProxy.getURLs(this.getClass().getClassLoader());
  -     if( serverCP!=null ) 
  -         cpath+=separator+extractClassPath(serverCP);
  +        ClassLoader parentLoader=ctx.getContextManager().getParentLoader();
  +        appsCP=jdkProxy.getParentURLs(parentLoader);
  +        commonCP=jdkProxy.getURLs(parentLoader);
  +     if( appsCP!=null ) 
  +         cpath+=separator+extractClassPath(appsCP);
        if( commonCP!=null ) 
            cpath+=separator+extractClassPath(commonCP);
        return cpath;