remm 2002/08/29 03:37:55
Modified: catalina/src/share/org/apache/catalina/core
StandardWrapper.java
Log:
- Capture output when unloading servlets.
Revision Changes Path
1.40 +16 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardWrapper.java
Index: StandardWrapper.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardWrapper.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- StandardWrapper.java 26 Jun 2002 13:41:12 -0000 1.39
+++ StandardWrapper.java 29 Aug 2002 10:37:55 -0000 1.40
@@ -1098,6 +1098,9 @@
Thread.currentThread().getContextClassLoader();
ClassLoader classLoader = instance.getClass().getClassLoader();
+ PrintStream out = System.out;
+ SystemLogHandler.startCapture();
+
// Call the servlet destroy() method
try {
instanceSupport.fireInstanceEvent
@@ -1120,6 +1123,15 @@
} finally {
// restore the context ClassLoader
Thread.currentThread().setContextClassLoader(oldCtxClassLoader);
+ // Write captured output
+ String log = SystemLogHandler.stopCapture();
+ if (log != null && log.length() > 0) {
+ if (getServletContext() != null) {
+ getServletContext().log(log);
+ } else {
+ out.println(log);
+ }
+ }
}
// Deregister the destroyed instance
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
