You are viewing a plain text version of this content. The canonical link for it is here.
Posted to s4-commits@incubator.apache.org by mm...@apache.org on 2012/07/04 08:35:45 UTC
[2/3] git commit: s4 node command / development mode improvements: -
set s4ScriptPath parameter as optional - fixed an NPE
s4 node command / development mode improvements:
- set s4ScriptPath parameter as optional
- fixed an NPE
Project: http://git-wip-us.apache.org/repos/asf/incubator-s4/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-s4/commit/6a398239
Tree: http://git-wip-us.apache.org/repos/asf/incubator-s4/tree/6a398239
Diff: http://git-wip-us.apache.org/repos/asf/incubator-s4/diff/6a398239
Branch: refs/heads/piper
Commit: 6a39823906baebb449f17fee4f2397a6c3899d9c
Parents: e438fbf
Author: Matthieu Morel <mm...@apache.org>
Authored: Tue Jul 3 18:18:05 2012 +0200
Committer: Matthieu Morel <mm...@apache.org>
Committed: Tue Jul 3 18:18:05 2012 +0200
----------------------------------------------------------------------
.../main/java/org/apache/s4/tools/S4ArgsBase.java | 2 +-
.../main/java/org/apache/s4/tools/ZKServer.java | 21 +++++++++-----
2 files changed, 14 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/6a398239/subprojects/s4-tools/src/main/java/org/apache/s4/tools/S4ArgsBase.java
----------------------------------------------------------------------
diff --git a/subprojects/s4-tools/src/main/java/org/apache/s4/tools/S4ArgsBase.java b/subprojects/s4-tools/src/main/java/org/apache/s4/tools/S4ArgsBase.java
index 213001d..52f1800 100644
--- a/subprojects/s4-tools/src/main/java/org/apache/s4/tools/S4ArgsBase.java
+++ b/subprojects/s4-tools/src/main/java/org/apache/s4/tools/S4ArgsBase.java
@@ -11,7 +11,7 @@ public abstract class S4ArgsBase {
@Parameter(names = "-help", description = "usage")
boolean help = false;
- @Parameter(names = "-s4ScriptPath", description = "path of the S4 script", hidden = true, required = true)
+ @Parameter(names = "-s4ScriptPath", description = "path of the S4 script", hidden = true, required = false)
String s4ScriptPath;
@Parameter(names = "-gradleOpts", variableArity = true, description = "gradle system properties (as in GRADLE_OPTS environment properties) passed to gradle scripts", required = false, converter = GradleOptsConverter.class)
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/6a398239/subprojects/s4-tools/src/main/java/org/apache/s4/tools/ZKServer.java
----------------------------------------------------------------------
diff --git a/subprojects/s4-tools/src/main/java/org/apache/s4/tools/ZKServer.java b/subprojects/s4-tools/src/main/java/org/apache/s4/tools/ZKServer.java
index 687e8cd..668499a 100644
--- a/subprojects/s4-tools/src/main/java/org/apache/s4/tools/ZKServer.java
+++ b/subprojects/s4-tools/src/main/java/org/apache/s4/tools/ZKServer.java
@@ -2,6 +2,7 @@ package org.apache.s4.tools;
import java.io.File;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -52,14 +53,18 @@ public class ZKServer {
// now upload cluster configs if specified or if using test mode
List<ClusterConfig> clusterConfigs = zkArgs.clusterConfigs;
- if (zkArgs.testMode && (clusterConfigs == null)) {
- logger.info("Initializing test mode with default clusters configurations");
- clusterConfigs = new ArrayList<ZKServer.ClusterConfig>() {
- {
- add(new ClusterConfig(TEST_MODE_CLUSTER_CONF_1));
- add(new ClusterConfig(TEST_MODE_CLUSTER_CONF_2));
- }
- };
+ if (clusterConfigs == null) {
+ if (zkArgs.testMode) {
+ logger.info("Initializing test mode with default clusters configurations");
+ clusterConfigs = new ArrayList<ZKServer.ClusterConfig>() {
+ {
+ add(new ClusterConfig(TEST_MODE_CLUSTER_CONF_1));
+ add(new ClusterConfig(TEST_MODE_CLUSTER_CONF_2));
+ }
+ };
+ } else {
+ clusterConfigs = Collections.emptyList();
+ }
}
for (ClusterConfig config : clusterConfigs) {
TaskSetup taskSetup = new TaskSetup("localhost:" + zkArgs.zkPort);