From e0e6f55f117ba04525664914ae6fa6bbf1fb86cc Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 13 Jan 2011 00:55:02 +0000
Subject: [PATCH] Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=18462
 Don't merge stdout and stderr internally

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1058379 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/catalina/startup/Catalina.java | 5 ++---
 java/org/apache/catalina/startup/Embedded.java | 5 ++---
 webapps/docs/changelog.xml                     | 5 +++++
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/java/org/apache/catalina/startup/Catalina.java b/java/org/apache/catalina/startup/Catalina.java
index 035999907..f164ca45e 100644
--- a/java/org/apache/catalina/startup/Catalina.java
+++ b/java/org/apache/catalina/startup/Catalina.java
@@ -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));
     }
 
 
diff --git a/java/org/apache/catalina/startup/Embedded.java b/java/org/apache/catalina/startup/Embedded.java
index a9f67dd1d..ef8df67b7 100644
--- a/java/org/apache/catalina/startup/Embedded.java
+++ b/java/org/apache/catalina/startup/Embedded.java
@@ -967,9 +967,8 @@ public class Embedded  extends StandardService {
     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));
         }
     }
     
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 41dd77514..7d2e3cbe4 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -44,6 +44,11 @@
 <section name="Tomcat 7.0.7 (markt)">
   <subsection name="Catalina">
     <changelog>
+      <fix>
+        <bug>18462</bug>: Don&apos;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)
-- 
2.11.0