cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/modules/mappers ReloadInterceptor.java

[co...@apache.org]

costin      01/08/20 22:16:37

  Modified:    src/share/org/apache/tomcat/modules/mappers
                        ReloadInterceptor.java
  Log:
  Use the fixed DependLoader. This will probably fail with JDK1.1 ( i.e. reloading
  will not work with 1.1 ). I'll fix this later, it's not a big priority ( reloading
  is important for development, etc - JDK1.1 is too limited anyway, and this would add
  an extra overhead ). Since this is not a critical functionality ( a container without
  reloading is still a valid container ), and small devices don't need this too much,
  it may remain unfixed for a while.
  
  ( well, it's not difficult to fix, but I put it at the end of the queue)
  
  Revision  Changes    Path
  1.9       +6 -2      jakarta-tomcat/src/share/org/apache/tomcat/modules/mappers/ReloadInterceptor.java
  
  Index: ReloadInterceptor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/mappers/ReloadInterceptor.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- ReloadInterceptor.java	2001/06/13 01:42:15	1.8
  +++ ReloadInterceptor.java	2001/08/21 05:16:36	1.9
  @@ -152,7 +152,11 @@
       protected void  loaderHook( DependManager dm, Context context ) {
   	// ReloadInterceptor must be configured _after_ LoaderInterceptor
   	ClassLoader cl=context.getClassLoader();
  -	ClassLoader loader=new DependClassLoader( dm, cl);
  +	
  +	ClassLoader loader=
  +	    new DependClassLoader12( dm, cl,
  +		     context.getAttribute( Context.ATTRIB_PROTECTION_DOMAIN));
  +
   	context.setClassLoader(loader);
   	context.setAttribute( "org.apache.tomcat.classloader", loader);
       }
  @@ -187,7 +191,7 @@
   		// So far we work as if the admin interface was
   		// used to remove/add the context.
   		// Or like the deploytool in J2EE.
  -		Context ctx1=new Context();
  +		Context ctx1=cm.createContext();
   		ctx1.setContextManager( cm );
   		ctx1.setPath(ctx.getPath());
   		ctx1.setDocBase(ctx.getDocBase());