[storm] branch master updated: [STORM-3385] Avoid two threads reading from the same input stream of a process

[ka...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

kabhwan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/storm.git


The following commit(s) were added to refs/heads/master by this push:
     new eacd235  [STORM-3385] Avoid two threads reading from the same input stream of a process
     new 50ae20d  Merge branch 'STORM-3385' of https://github.com/Ethanlm/storm into STORM-3385-merge
eacd235 is described below

commit eacd235639da54810060fe61c5cd4904c2ebd3a9
Author: Ethan Li <et...@gmail.com>
AuthorDate: Wed May 1 09:29:44 2019 -0500

    [STORM-3385] Avoid two threads reading from the same input stream of a process
---
 .../jvm/org/apache/storm/daemon/supervisor/ClientSupervisorUtils.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/storm-client/src/jvm/org/apache/storm/daemon/supervisor/ClientSupervisorUtils.java b/storm-client/src/jvm/org/apache/storm/daemon/supervisor/ClientSupervisorUtils.java
index c8192d3..8ee8b63 100644
--- a/storm-client/src/jvm/org/apache/storm/daemon/supervisor/ClientSupervisorUtils.java
+++ b/storm-client/src/jvm/org/apache/storm/daemon/supervisor/ClientSupervisorUtils.java
@@ -64,7 +64,7 @@ public class ClientSupervisorUtils {
                                              final Map<String, String> environment, final String logPreFix)
         throws IOException {
         int ret = 0;
-        Process process = processLauncher(conf, user, null, args, environment, logPreFix, null, null);
+        Process process = processLauncher(conf, user, null, args, environment, null, null, null);
         if (StringUtils.isNotBlank(logPreFix)) {
             Utils.readAndLogStream(logPreFix, process.getInputStream());
         }