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-catalina/catalina/src/share/org/apache/catalina/startup Catalina.java
Date Fri, 10 Jan 2003 18:48:49 GMT
costin      2003/01/10 10:48:49

  Modified:    catalina/src/share/org/apache/catalina/startup Catalina.java
  Log:
  Some versions of digester ( head ? ) seem to require the classloader to
  be set. It doesn't hurt to set it explicitely.
  
  Revision  Changes    Path
  1.12      +6 -7      jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Catalina.java
  
  Index: Catalina.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Catalina.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- Catalina.java	5 Dec 2002 15:57:48 -0000	1.11
  +++ Catalina.java	10 Jan 2003 18:48:49 -0000	1.12
  @@ -70,13 +70,11 @@
   import java.io.IOException;
   import java.io.OutputStream;
   import java.net.Socket;
  -import java.util.Stack;
   import org.apache.catalina.Container;
   import org.apache.catalina.Lifecycle;
   import org.apache.catalina.LifecycleException;
  -import org.apache.catalina.LifecycleListener;
   import org.apache.catalina.Server;
  -import org.apache.catalina.Loader;
  +import org.apache.catalina.core.StandardServer;
   import org.apache.catalina.security.SecurityConfig;
   import org.apache.commons.digester.Digester;
   import org.apache.commons.digester.Rule;
  @@ -289,6 +287,7 @@
           if (debug>0)
               digester.setDebug(debug);
           digester.setValidating(false);
  +        digester.setClassLoader(StandardServer.class.getClassLoader());
   
           // Configure the actions we will be using
           digester.addObjectCreate("Server",
  
  
  

--
To unsubscribe, e-mail:   <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@jakarta.apache.org>


Mime
View raw message