Repository: hadoop Updated Branches: refs/heads/ozone-0.2 435c3eacf -> 4d2db4259
HDDS-466. Handle null in argv of StorageContainerManager#createSCM. Contributed by Nanda kumar (cherry picked from commit b0a659c8c0500c47f974518ec98ae44c283db9f4) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/4d2db425 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4d2db425 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4d2db425 Branch: refs/heads/ozone-0.2 Commit: 4d2db42595de9e5908e33ec4b4c65dabdd35e687 Parents: 435c3ea Author: Nanda kumar <[email protected]> Authored: Sat Sep 15 02:34:33 2018 +0530 Committer: Nanda kumar <[email protected]> Committed: Sat Sep 15 02:35:25 2018 +0530 ---------------------------------------------------------------------- .../apache/hadoop/hdds/scm/server/StorageContainerManager.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/4d2db425/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java ---------------------------------------------------------------------- diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java index b3408a4..60796c7 100644 --- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java +++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java @@ -376,9 +376,10 @@ public final class StorageContainerManager extends ServiceRuntimeInfoImpl out.println(USAGE + "\n"); } - public static StorageContainerManager createSCM(String[] argv, + public static StorageContainerManager createSCM(String[] args, OzoneConfiguration conf) throws IOException { + String[] argv = (args == null) ? new String[0] : args; if (!HddsUtils.isHddsEnabled(conf)) { System.err.println( "SCM cannot be started in secure mode or when " + OZONE_ENABLED + "" + --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
