cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gree...@locus.apache.org
Subject cvs commit: xml-cocoon/src/org/apache/cocoon/framework Manager.java
Date Sun, 03 Dec 2000 19:54:48 GMT
greenrd     00/12/03 11:54:48

  Modified:    src/org/apache/cocoon/framework Manager.java
  Log:
  tomcat 3.1 classloader workaround
  
  Revision  Changes    Path
  1.10      +16 -4     xml-cocoon/src/org/apache/cocoon/framework/Manager.java
  
  Index: Manager.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/framework/Manager.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- Manager.java	2000/11/16 17:31:56	1.9
  +++ Manager.java	2000/12/03 19:54:48	1.10
  @@ -1,4 +1,4 @@
  -/*-- $Id: Manager.java,v 1.9 2000/11/16 17:31:56 greenrd Exp $ --
  +/*-- $Id: Manager.java,v 1.10 2000/12/03 19:54:48 greenrd Exp $ --
   
    ============================================================================
                      The Apache Software License, Version 1.1
  @@ -57,18 +57,26 @@
    * This class is used to create and control software actors and resources.
    *
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
  - * @version $Revision: 1.9 $ $Date: 2000/11/16 17:31:56 $
  + * @version $Revision: 1.10 $ $Date: 2000/12/03 19:54:48 $
    */
   
  -public class Manager extends Hashtable implements Actor, Factory, Director {
  +public class Manager 
  +  extends Hashtable implements Actor, Factory, Director, DestroyListener {
   
  -    private ClassLoader classloader;
  +    static {
  +        // Tomcat 3.1 classloader workaround
  +        try {
  +            Class.forName ("org.apache.cocoon.framework.DestroyListener");
  +        }
  +        catch (ClassNotFoundException ex) {
  +            ex.printStackTrace ();
  +        }
  +    }
   
       /**
        * Initialize the actor by indicating their director.
        */
       public void init(Director director) {
  -        this.classloader = this.getClass().getClassLoader();
       }
   
       /**
  @@ -136,6 +144,10 @@
            return v;
        }
   
  +    public void destroy () {
  +      destroyAll ();
  +    }
  +
       /**
        * Calls destroy() on all components that are instances of DestroyListener
        */
  @@ -143,7 +155,7 @@
          Enumeration e = elements ();
          while (e.hasMoreElements ()) {
             Object x = e.nextElement ();
  -          if (x instanceof DestroyListener) {
  +          if (x instanceof DestroyListener && x != this) {
               ((DestroyListener) x).destroy ();
             }
          }
  
  
  

Mime
View raw message