Repository: karaf Updated Branches: refs/heads/master 575453279 -> 48b3270c0
[KARAF-4630] Fix race condition in StreamPumper Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/48b3270c Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/48b3270c Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/48b3270c Branch: refs/heads/master Commit: 48b3270c022d92bc4eeab192c51b0b9b4d000867 Parents: 5754532 Author: jpoth <[email protected]> Authored: Tue Jul 19 18:27:53 2016 +0200 Committer: Guillaume Nodet <[email protected]> Committed: Thu Jul 21 12:06:38 2016 +0200 ---------------------------------------------------------------------- .../main/java/org/apache/karaf/util/process/StreamPumper.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/48b3270c/util/src/main/java/org/apache/karaf/util/process/StreamPumper.java ---------------------------------------------------------------------- diff --git a/util/src/main/java/org/apache/karaf/util/process/StreamPumper.java b/util/src/main/java/org/apache/karaf/util/process/StreamPumper.java index 3001442..9068fba 100644 --- a/util/src/main/java/org/apache/karaf/util/process/StreamPumper.java +++ b/util/src/main/java/org/apache/karaf/util/process/StreamPumper.java @@ -31,9 +31,9 @@ public class StreamPumper implements Runnable { private OutputStream out; - private volatile boolean finish; + private volatile boolean finish = false; - private volatile boolean finished; + private volatile boolean finished = false; private boolean closeWhenExhausted; @@ -109,8 +109,6 @@ public class StreamPumper implements Runnable { public void run() { synchronized (this) { started = true; - finished = false; - finish = false; thread = Thread.currentThread(); }
