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: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
