remm 2002/12/05 01:12:38
Modified: catalina/src/share/org/apache/catalina/core
StandardWrapper.java
Log:
- Use the swallowOutput flag when unloading (bug 15086).
Revision Changes Path
1.43 +15 -11
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.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- StandardWrapper.java 27 Sep 2002 07:12:01 -0000 1.42
+++ StandardWrapper.java 5 Dec 2002 09:12:37 -0000 1.43
@@ -1111,7 +1111,9 @@
ClassLoader classLoader = instance.getClass().getClassLoader();
PrintStream out = System.out;
- SystemLogHandler.startCapture();
+ if (swallowOutput) {
+ SystemLogHandler.startCapture();
+ }
// Call the servlet destroy() method
try {
@@ -1136,12 +1138,14 @@
// 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);
+ if (swallowOutput) {
+ String log = SystemLogHandler.stopCapture();
+ if (log != null && log.length() > 0) {
+ if (getServletContext() != null) {
+ getServletContext().log(log);
+ } else {
+ out.println(log);
+ }
}
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
