Return-Path: Delivered-To: apmail-jakarta-tomcat-dev-archive@apache.org Received: (qmail 43085 invoked from network); 5 Apr 2003 04:03:11 -0000 Received: from exchange.sun.com (192.18.33.10) by daedalus.apache.org with SMTP; 5 Apr 2003 04:03:11 -0000 Received: (qmail 14280 invoked by uid 97); 5 Apr 2003 04:05:11 -0000 Delivered-To: qmlist-jakarta-archive-tomcat-dev@nagoya.betaversion.org Received: (qmail 14273 invoked from network); 5 Apr 2003 04:05:11 -0000 Received: from daedalus.apache.org (HELO apache.org) (208.185.179.12) by nagoya.betaversion.org with SMTP; 5 Apr 2003 04:05:11 -0000 Received: (qmail 42240 invoked by uid 500); 5 Apr 2003 04:03:04 -0000 Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Tomcat Developers List" Reply-To: "Tomcat Developers List" Delivered-To: mailing list tomcat-dev@jakarta.apache.org Received: (qmail 42229 invoked by uid 500); 5 Apr 2003 04:03:04 -0000 Received: (qmail 42226 invoked from network); 5 Apr 2003 04:03:04 -0000 Received: from icarus.apache.org (208.185.179.13) by daedalus.apache.org with SMTP; 5 Apr 2003 04:03:04 -0000 Received: (qmail 27146 invoked by uid 1052); 5 Apr 2003 04:03:07 -0000 Date: 5 Apr 2003 04:03:07 -0000 Message-ID: <20030405040307.27144.qmail@icarus.apache.org> From: costin@apache.org To: jakarta-tomcat-catalina-cvs@apache.org Subject: cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core StandardWrapper.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N costin 2003/04/04 20:03:07 Modified: catalina/src/share/org/apache/catalina/core StandardWrapper.java Log: Set the controller - so we are unregistered. Reduce the verbosity ( same message was displayed 2 times ) Revision Changes Path 1.22 +8 -8 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardWrapper.java Index: StandardWrapper.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardWrapper.java,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- StandardWrapper.java 4 Apr 2003 23:22:09 -0000 1.21 +++ StandardWrapper.java 5 Apr 2003 04:03:07 -0000 1.22 @@ -677,9 +677,6 @@ */ public Servlet allocate() throws ServletException { - if (log.isDebugEnabled()) - log.debug("Allocating an instance"); - // If we are currently unloading this servlet, throw an exception if (unloading) throw new ServletException @@ -693,6 +690,9 @@ synchronized (this) { if (instance == null) { try { + if (log.isDebugEnabled()) + log.debug("Allocating non-STM instance"); + instance = loadServlet(); } catch (ServletException e) { throw e; @@ -1564,7 +1564,7 @@ ctx.getJ2EEServer(); oname=new ObjectName(onameStr); - + controller=oname; Registry.getRegistry().registerComponent(this, oname, null ); } catch( Exception ex ) { log.info("Error registering servlet with jmx " + this); --------------------------------------------------------------------- To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org