From 6739d2902053b4eb03899f17a738683068810406 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Fri, 18 Oct 2002 07:00:54 +0000
Subject: [PATCH] Avoid hanging listcab on large filesets (because writing the
 filelist blocks before listcab's output is being read).

PR: 13546
Submitted by:	Jim Newsham <newsham at hotu.com>


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@273450 13f79535-47bb-0310-9956-ffa450edef68
---
 WHATSNEW                                                 | 2 ++
 src/main/org/apache/tools/ant/taskdefs/optional/Cab.java | 7 ++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/WHATSNEW b/WHATSNEW
index 5d9a32755..96b39a9ec 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -28,6 +28,8 @@ Fixed bugs:
 * The "plain" <junit> <formatter> could throw a NullPointerException
   if an error occured in setUp.
 
+* <cab> could hang listcab on large <fileset>s.
+
 Other changes:
 --------------
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java b/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java
index 798885d2e..04feb6827 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java
@@ -266,9 +266,6 @@ public class Cab extends MatchingTask {
                                            new String[] {"listcab"}, null,
                                            baseDir, true);
                 OutputStream out = p.getOutputStream();
-                out.write(sb.toString().getBytes());
-                out.flush();
-                out.close();
 
                 // Create the stream pumpers to forward listcab's stdout and stderr to the log
                 // note: listcab is an interactive program, and issues prompts for every new line.
@@ -282,6 +279,10 @@ public class Cab extends MatchingTask {
                 (new Thread(outPump)).start();
                 (new Thread(errPump)).start();
 
+                out.write(sb.toString().getBytes());
+                out.flush();
+                out.close();
+
                 int result = -99; // A wild default for when the thread is interrupted
 
                 try {