You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by na...@apache.org on 2018/09/14 21:04:55 UTC
hadoop git commit: HDDS-466. Handle null in argv of
StorageContainerManager#createSCM. Contributed by Nanda kumar
Repository: hadoop
Updated Branches:
refs/heads/trunk 6f037468b -> b0a659c8c
HDDS-466. Handle null in argv of StorageContainerManager#createSCM. Contributed by Nanda kumar
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b0a659c8
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b0a659c8
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b0a659c8
Branch: refs/heads/trunk
Commit: b0a659c8c0500c47f974518ec98ae44c283db9f4
Parents: 6f03746
Author: Nanda kumar <na...@apache.org>
Authored: Sat Sep 15 02:34:33 2018 +0530
Committer: Nanda kumar <na...@apache.org>
Committed: Sat Sep 15 02:34:33 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/b0a659c8/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: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org