tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cos...@apache.org
Subject cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/startup EmbededTomcat.java
Date Sat, 13 Oct 2001 04:26:54 GMT
costin      01/10/12 21:26:54

  Modified:    src/share/org/apache/tomcat/startup EmbededTomcat.java
  Log:
  Few checks for NPE, discovered while playing with EmbededTomcat and ant.
  
  ( Thanks Ovidiu for sending the ant tasks that showed that )
  
  Revision  Changes    Path
  1.59      +6 -2      jakarta-tomcat/src/share/org/apache/tomcat/startup/EmbededTomcat.java
  
  Index: EmbededTomcat.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/startup/EmbededTomcat.java,v
  retrieving revision 1.58
  retrieving revision 1.59
  diff -u -r1.58 -r1.59
  --- EmbededTomcat.java	2001/09/29 04:42:23	1.58
  +++ EmbededTomcat.java	2001/10/13 04:26:54	1.59
  @@ -682,6 +682,9 @@
   	this.containerCL=cl;
       }
   
  +    public ClassLoader getContainerClassLoader() {
  +	return containerCL;
  +    }
       // -------------------- Class loader methods --------------------
   
       static final Jdk11Compat jdk11Compat=Jdk11Compat.getJdkCompat();
  @@ -750,7 +753,8 @@
   	if( modulesCP!= null )
   	    cp=IntrospectionUtils.classPathAdd(modulesCP,cp);
   	cp=IntrospectionUtils.classPathAdd(appsCP,cp);
  -	System.getProperties().put("tc_path_add",cp);
  +	if( cp != null ) 
  +	    System.getProperties().put("tc_path_add",cp);
   	
   	contextM.setParentLoader(parentCL);
   	contextM.setCommonLoader(modulesCL);
  @@ -809,7 +813,7 @@
   	if( t!=null) t.printStackTrace();
       }
   
  -    protected BaseInterceptor createModule( String classN ) {
  +    public BaseInterceptor createModule( String classN ) {
   	try {
   	    Class c=containerCL.loadClass( classN );
   	    return (BaseInterceptor)c.newInstance();
  
  
  

Mime
View raw message