You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@cocoon.apache.org by Marcus Crafter <cr...@fztig938.bank.dresdner.net> on 2002/10/04 18:20:41 UTC
Re: cvs commit: xml-cocoon2/src/java/org/apache/cocoon/servlet CocoonServlet.java
Thanks! :)
Cheers,
Marcus
On Fri, Oct 04, 2002 at 08:46:06AM -0000, giacomo@apache.org wrote:
> giacomo 2002/10/04 01:46:05
>
> Modified: src/java/org/apache/cocoon/servlet CocoonServlet.java
> Log:
> dispose InstrumentManager. Tomcat seems to hang on shutdown if not
>
> Revision Changes Path
> 1.40 +13 -3 xml-cocoon2/src/java/org/apache/cocoon/servlet/CocoonServlet.java
>
> Index: CocoonServlet.java
> ===================================================================
> RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/servlet/CocoonServlet.java,v
> retrieving revision 1.39
> retrieving revision 1.40
> diff -u -r1.39 -r1.40
> --- CocoonServlet.java 27 Sep 2002 16:27:38 -0000 1.39
> +++ CocoonServlet.java 4 Oct 2002 08:46:05 -0000 1.40
> @@ -15,7 +15,7 @@
> 2. Redistributions in binary form must reproduce the above copyright notice,
> this list of conditions and the following disclaimer in the documentation
> and/or other materials provided with the distribution.
> -
> +
> 3. The end-user documentation included with the redistribution, if any, must
> include the following acknowledgment: "This product includes software
> developed by the Apache Software Foundation (http://www.apache.org/)."
> @@ -49,7 +49,7 @@
>
> */
> package org.apache.cocoon.servlet;
> -
> +
> import org.apache.avalon.excalibur.logger.DefaultLogKitManager;
> import org.apache.avalon.excalibur.logger.LogKitManager;
> import org.apache.avalon.framework.activity.Initializable;
> @@ -187,6 +187,11 @@
> private boolean enableInstrumentation;
>
> /**
> + * The <code>InstrumentManager</code> instance
> + */
> + private DefaultInstrumentManager instrumentManager;
> +
> + /**
> * This is the path to the servlet context (or the result
> * of calling getRealPath('/') on the ServletContext.
> * Note, that this can be null.
> @@ -483,6 +488,10 @@
> }
> this.disposeCocoon();
> }
> +
> + if (this.enableInstrumentation) {
> + this.instrumentManager.dispose();
> + }
> }
>
> /**
> @@ -1316,6 +1325,7 @@
> log.debug("Instrument manager created " + instrumentManager);
> }
>
> + this.instrumentManager = instrumentManager;
> return instrumentManager;
> }
>
>
>
>
>
> ----------------------------------------------------------------------
> In case of troubles, e-mail: webmaster@xml.apache.org
> To unsubscribe, e-mail: cocoon-cvs-unsubscribe@xml.apache.org
> For additional commands, e-mail: cocoon-cvs-help@xml.apache.org
>
--
.....
,,$$$$$$$$$, Marcus Crafter
;$' '$$$$: Computer Systems Engineer
$: $$$$: ManageSoft GmbH
$ o_)$$$: 82-84 Mainzer Landstrasse
;$, _/\ &&:' 60327 Frankfurt Germany
' /( &&&
\_&&&&'
&&&&.
&&&&&&&:
---------------------------------------------------------------------
To unsubscribe, e-mail: cocoon-dev-unsubscribe@xml.apache.org
For additional commands, email: cocoon-dev-help@xml.apache.org
Re: cvs commit: xml-cocoon2/src/java/org/apache/cocoon/servlet
CocoonServlet.java
Posted by Giacomo Pati <gi...@apache.org>.
On Fri, 4 Oct 2002, Marcus Crafter wrote:
> Thanks! :)
No prob. Someone needs to do it on Fortress as well (hint, hint).
Giacomo
>
> Cheers,
>
> Marcus
>
> On Fri, Oct 04, 2002 at 08:46:06AM -0000, giacomo@apache.org wrote:
> > giacomo 2002/10/04 01:46:05
> >
> > Modified: src/java/org/apache/cocoon/servlet CocoonServlet.java
> > Log:
> > dispose InstrumentManager. Tomcat seems to hang on shutdown if not
> >
> > Revision Changes Path
> > 1.40 +13 -3 xml-cocoon2/src/java/org/apache/cocoon/servlet/CocoonServlet.java
> >
> > Index: CocoonServlet.java
> > ===================================================================
> > RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/servlet/CocoonServlet.java,v
> > retrieving revision 1.39
> > retrieving revision 1.40
> > diff -u -r1.39 -r1.40
> > --- CocoonServlet.java 27 Sep 2002 16:27:38 -0000 1.39
> > +++ CocoonServlet.java 4 Oct 2002 08:46:05 -0000 1.40
> > @@ -15,7 +15,7 @@
> > 2. Redistributions in binary form must reproduce the above copyright notice,
> > this list of conditions and the following disclaimer in the documentation
> > and/or other materials provided with the distribution.
> > -
> > +
> > 3. The end-user documentation included with the redistribution, if any, must
> > include the following acknowledgment: "This product includes software
> > developed by the Apache Software Foundation (http://www.apache.org/)."
> > @@ -49,7 +49,7 @@
> >
> > */
> > package org.apache.cocoon.servlet;
> > -
> > +
> > import org.apache.avalon.excalibur.logger.DefaultLogKitManager;
> > import org.apache.avalon.excalibur.logger.LogKitManager;
> > import org.apache.avalon.framework.activity.Initializable;
> > @@ -187,6 +187,11 @@
> > private boolean enableInstrumentation;
> >
> > /**
> > + * The <code>InstrumentManager</code> instance
> > + */
> > + private DefaultInstrumentManager instrumentManager;
> > +
> > + /**
> > * This is the path to the servlet context (or the result
> > * of calling getRealPath('/') on the ServletContext.
> > * Note, that this can be null.
> > @@ -483,6 +488,10 @@
> > }
> > this.disposeCocoon();
> > }
> > +
> > + if (this.enableInstrumentation) {
> > + this.instrumentManager.dispose();
> > + }
> > }
> >
> > /**
> > @@ -1316,6 +1325,7 @@
> > log.debug("Instrument manager created " + instrumentManager);
> > }
> >
> > + this.instrumentManager = instrumentManager;
> > return instrumentManager;
> > }
> >
> >
> >
> >
> >
> > ----------------------------------------------------------------------
> > In case of troubles, e-mail: webmaster@xml.apache.org
> > To unsubscribe, e-mail: cocoon-cvs-unsubscribe@xml.apache.org
> > For additional commands, e-mail: cocoon-cvs-help@xml.apache.org
> >
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: cocoon-dev-unsubscribe@xml.apache.org
For additional commands, email: cocoon-dev-help@xml.apache.org