Author: markt
Date: Thu Jan 13 00:55:02 2011
New Revision: 1058379
URL: http://svn.apache.org/viewvc?rev=1058379&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=18462
Don't merge stdout and stderr internally
Modified:
tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
tomcat/trunk/java/org/apache/catalina/startup/Embedded.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Catalina.java?rev=1058379&r1=1058378&r2=1058379&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/Catalina.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Catalina.java Thu Jan 13
00:55:02 2011
@@ -759,9 +759,8 @@ public class Catalina {
protected void initStreams() {
// Replace System.out and System.err with a custom PrintStream
- SystemLogHandler systemlog = new SystemLogHandler(System.out);
- System.setOut(systemlog);
- System.setErr(systemlog);
+ System.setOut(new SystemLogHandler(System.out));
+ System.setErr(new SystemLogHandler(System.err));
}
Modified: tomcat/trunk/java/org/apache/catalina/startup/Embedded.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Embedded.java?rev=1058379&r1=1058378&r2=1058379&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/Embedded.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Embedded.java Thu Jan 13
00:55:02 2011
@@ -967,9 +967,8 @@ public class Embedded extends StandardS
protected void initStreams() {
if (redirectStreams) {
// Replace System.out and System.err with a custom PrintStream
- SystemLogHandler systemlog = new SystemLogHandler(System.out);
- System.setOut(systemlog);
- System.setErr(systemlog);
+ System.setOut(new SystemLogHandler(System.out));
+ System.setErr(new SystemLogHandler(System.err));
}
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1058379&r1=1058378&r2=1058379&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Jan 13 00:55:02 2011
@@ -44,6 +44,11 @@
<section name="Tomcat 7.0.7 (markt)">
<subsection name="Catalina">
<changelog>
+ <fix>
+ <bug>18462</bug>: Don't merge <code>stdout</code> and
+ <code>stderr</code> internally so users retain the option to treat the
+ separately. (markt)
+ </fix>
<update>
Improve fix for <bug>50205</bug> to trigger an error earlier if invalid
configuration is used. (markt)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
