Browse Source

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
master
Antoine Levy-Lambert 22 years ago
parent
commit
2807da85ed
1 changed files with 3 additions and 2 deletions
  1. +3
    -2
      src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4HandlerAdapter.java

+ 3
- 2
src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4HandlerAdapter.java View File

@@ -90,7 +90,8 @@ public abstract class P4HandlerAdapter implements P4Handler {
Thread error = new Thread(new Reader(es)); Thread error = new Thread(new Reader(es));
output.start(); output.start();
error.start(); error.start();

output.join();
error.join();
} catch (Exception e) { } catch (Exception e) {
throw new BuildException(e); throw new BuildException(e);
} }
@@ -114,7 +115,7 @@ public abstract class P4HandlerAdapter implements P4Handler {


public void stop() { public void stop() {
} }
public class Reader implements Runnable { public class Reader implements Runnable {
protected InputStream mystream; protected InputStream mystream;
public Reader(InputStream is) public Reader(InputStream is)


Loading…
Cancel
Save