Repository: storm Updated Branches: refs/heads/master 3a1607038 -> 1bdc922e2
STORM-2110: strip out empty String in worker opts Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/874e7306 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/874e7306 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/874e7306 Branch: refs/heads/master Commit: 874e730668c10efde55c907318920a7b095e091f Parents: 84641f6 Author: Robert (Bobby) Evans <ev...@yahoo-inc.com> Authored: Wed Sep 21 11:16:23 2016 -0500 Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com> Committed: Wed Sep 21 11:16:23 2016 -0500 ---------------------------------------------------------------------- .../jvm/org/apache/storm/daemon/supervisor/BasicContainer.java | 6 +++++- .../org/apache/storm/daemon/supervisor/BasicContainerTest.java | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/874e7306/storm-core/src/jvm/org/apache/storm/daemon/supervisor/BasicContainer.java ---------------------------------------------------------------------- diff --git a/storm-core/src/jvm/org/apache/storm/daemon/supervisor/BasicContainer.java b/storm-core/src/jvm/org/apache/storm/daemon/supervisor/BasicContainer.java index efaa352..93c10c7 100644 --- a/storm-core/src/jvm/org/apache/storm/daemon/supervisor/BasicContainer.java +++ b/storm-core/src/jvm/org/apache/storm/daemon/supervisor/BasicContainer.java @@ -409,7 +409,11 @@ public class BasicContainer extends Container { String string = substituteChildOptsInternal((String) value, memOnheap); if (StringUtils.isNotBlank(string)) { String[] strings = string.split("\\s+"); - rets.addAll(Arrays.asList(strings)); + for (String s: strings) { + if (StringUtils.isNotBlank(s)) { + rets.add(s); + } + } } } else if (value instanceof List) { @SuppressWarnings("unchecked") http://git-wip-us.apache.org/repos/asf/storm/blob/874e7306/storm-core/test/jvm/org/apache/storm/daemon/supervisor/BasicContainerTest.java ---------------------------------------------------------------------- diff --git a/storm-core/test/jvm/org/apache/storm/daemon/supervisor/BasicContainerTest.java b/storm-core/test/jvm/org/apache/storm/daemon/supervisor/BasicContainerTest.java index 5265cf6..e2b0bf8 100644 --- a/storm-core/test/jvm/org/apache/storm/daemon/supervisor/BasicContainerTest.java +++ b/storm-core/test/jvm/org/apache/storm/daemon/supervisor/BasicContainerTest.java @@ -379,6 +379,7 @@ public class BasicContainerTest { superConf.put(Config.STORM_LOCAL_DIR, stormLocal); superConf.put(Config.STORM_WORKERS_ARTIFACTS_DIR, stormLocal); superConf.put(Config.STORM_LOG4J2_CONF_DIR, log4jdir); + superConf.put(Config.WORKER_CHILDOPTS, " -Dtesting=true"); LocalAssignment la = new LocalAssignment(); la.set_topology_id(topoId); @@ -389,7 +390,6 @@ public class BasicContainerTest { LocalState ls = mock(LocalState.class); - checkpoint(() -> { MockBasicContainer mc = new MockBasicContainer(ContainerType.LAUNCH, superConf, "SUPERVISOR", port, la, null, ls, workerId, new HashMap<>(), ops, "profile"); @@ -428,6 +428,7 @@ public class BasicContainerTest { "-Dlog4j.configurationFile=" + workerConf, "-DLog4jContextSelector=org.apache.logging.log4j.core.selector.BasicContextSelector", "-Dstorm.local.dir=" + stormLocal, + "-Dtesting=true", "-Djava.library.path=JLP", "-Dstorm.conf.file=", "-Dstorm.options=",
