Repository: karaf Updated Branches: refs/heads/karaf-4.0.x d15407c45 -> 52c4c4b84
[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/52c4c4b8 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/52c4c4b8 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/52c4c4b8 Branch: refs/heads/karaf-4.0.x Commit: 52c4c4b8441da8cfce49281a0925f722a7752a5c Parents: d15407c Author: jpoth <[email protected]> Authored: Tue Jul 19 18:27:53 2016 +0200 Committer: Guillaume Nodet <[email protected]> Committed: Thu Jul 21 14:21:31 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/52c4c4b8/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 b49cdae..d6f5e1d 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 @@ -32,9 +32,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; @@ -110,8 +110,6 @@ public class StreamPumper implements Runnable public void run() { synchronized (this) { started = true; - finished = false; - finish = false; thread = Thread.currentThread(); }
