From f60db1986400d56bb57dc1141a317f7fb4568ebf Mon Sep 17 00:00:00 2001
From: Nicolas Lalevee <hibou@apache.org>
Date: Wed, 27 Apr 2011 22:14:03 +0000
Subject: [PATCH] Revert commit #1095768 on java.xml and fix the redirector to
 not funnel streams if there is an errorProperty set

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@1097261 13f79535-47bb-0310-9956-ffa450edef68
---
 src/etc/testcases/taskdefs/java.xml                    | 8 ++++----
 src/main/org/apache/tools/ant/taskdefs/Redirector.java | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/etc/testcases/taskdefs/java.xml b/src/etc/testcases/taskdefs/java.xml
index 6e2e1ccb0..2a7fe3c74 100644
--- a/src/etc/testcases/taskdefs/java.xml
+++ b/src/etc/testcases/taskdefs/java.xml
@@ -208,11 +208,11 @@
         <loadfile property="redirect.out.contents" srcfile="${outfile}" />
 
         <condition property="r1file">
-            <equals arg1="${redirect.out.contents}" arg2="foo${line.separator}" />
+            <equals arg1="${redirect.out.contents}" arg2="foo" />
         </condition>
 
         <fail unless="r1file">${outfile}:
-&quot;${redirect.out.contents}&quot; expected &quot;foo&#010;&quot;</fail>
+&quot;${redirect.out.contents}&quot; expected &quot;foo&quot;</fail>
 
         <condition property="r1prop">
             <equals arg1="${redirect.err}" arg2="" />
@@ -248,11 +248,11 @@ redirect.err=&quot;${redirect.err}&quot; should be empty</fail>
         <loadfile property="redirect.out.contents2" srcfile="${outfile}" />
 
         <condition property="r2file">
-            <equals arg1="${redirect.out.contents2}" arg2="foo${line.separator}bar${line.separator}" />
+            <equals arg1="${redirect.out.contents2}" arg2="foobar" />
         </condition>
 
         <fail unless="r2file">${outfile}:
-&quot;${redirect.out.contents2}&quot; expected &quot;foo&#010;bar&#010;&quot;</fail>
+&quot;${redirect.out.contents2}&quot; expected &quot;foobar&quot;</fail>
 
         <condition property="r2prop">
             <!-- property should not change -->
diff --git a/src/main/org/apache/tools/ant/taskdefs/Redirector.java b/src/main/org/apache/tools/ant/taskdefs/Redirector.java
index 70fcb27f6..5d2b1ad94 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Redirector.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Redirector.java
@@ -717,7 +717,7 @@ public class Redirector {
                     .toString();
             errorStream = foldFiles(error, logHead, Project.MSG_VERBOSE,
                     appendErr, createEmptyFilesErr);
-        } else if (!(logError || outputStream == null)) {
+        } else if (!(logError || outputStream == null) && errorProperty == null) {
             long funnelTimeout = 0L;
             OutputStreamFunneler funneler = new OutputStreamFunneler(
                     outputStream, funnelTimeout);