From 2807da85ed8fe41cf97162b4642cc3451d7a7db3 Mon Sep 17 00:00:00 2001
From: Antoine Levy-Lambert <antoine@apache.org>
Date: Tue, 15 Apr 2003 19:16:03 +0000
Subject: [PATCH] fix bugrep 18956 p4change task causes build to hang

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274467 13f79535-47bb-0310-9956-ffa450edef68
---
 .../ant/taskdefs/optional/perforce/P4HandlerAdapter.java     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4HandlerAdapter.java b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4HandlerAdapter.java
index 969769bfb..267774012 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4HandlerAdapter.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4HandlerAdapter.java
@@ -90,7 +90,8 @@ public abstract class P4HandlerAdapter implements P4Handler {
             Thread error = new Thread(new Reader(es));
             output.start();
             error.start();
-
+            output.join();
+            error.join();
         } catch (Exception e) {
             throw new BuildException(e);
         }
@@ -114,7 +115,7 @@ public abstract class P4HandlerAdapter implements P4Handler {
 
     public void stop() {
     }
-    
+
     public class Reader implements Runnable {
         protected InputStream mystream;
         public Reader(InputStream is)