You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by la...@apache.org on 2001/09/08 22:11:00 UTC

cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/modules/config LoaderInterceptor11.java

larryi      01/09/08 13:11:00

  Modified:    src/share/org/apache/tomcat/modules/config
                        LoaderInterceptor11.java
  Log:
  Make useNoParent take priority over useAppsL.  This shouldn't hurt
  usability and is more straightforward to document.
  
  Revision  Changes    Path
  1.18      +4 -4      jakarta-tomcat/src/share/org/apache/tomcat/modules/config/LoaderInterceptor11.java
  
  Index: LoaderInterceptor11.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/config/LoaderInterceptor11.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- LoaderInterceptor11.java	2001/08/21 04:58:22	1.17
  +++ LoaderInterceptor11.java	2001/09/08 20:11:00	1.18
  @@ -207,12 +207,12 @@
           }
   
   	ClassLoader parent=null;
  -	if( useAppsL && !context.isTrusted() ) {
  -	    if( debug > 0 ) log( "Using webapp loader " + context.isTrusted());
  -	    parent=cm.getAppsLoader();
  -	} else if( useNoParent ) {
  +	if( useNoParent ) {
   	    if( debug > 0 ) log( "Using no parent loader ");
   	    parent=null;
  +	} else if( useAppsL && !context.isTrusted() ) {
  +	    if( debug > 0 ) log( "Using webapp loader " + context.isTrusted());
  +	    parent=cm.getAppsLoader();
   	} else {
   	    if( debug > 0 ) log( "Using container loader ");
   	    parent=this.getClass().getClassLoader();