antoine 2003/04/15 12:16:05
Modified: src/main/org/apache/tools/ant/taskdefs/optional/perforce
P4HandlerAdapter.java
Log:
fix bugrep 18956 p4change task causes build to hang
Revision Changes Path
1.11 +3 -2
ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4HandlerAdapter.java
Index: P4HandlerAdapter.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4HandlerAdapter.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- P4HandlerAdapter.java 10 Feb 2003 14:14:19 -0000 1.10
+++ P4HandlerAdapter.java 15 Apr 2003 19:16:03 -0000 1.11
@@ -90,7 +90,8 @@
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 void stop() {
}
-
+
public class Reader implements Runnable {
protected InputStream mystream;
public Reader(InputStream is)
