浏览代码

HDDS-466. Handle null in argv of StorageContainerManager#createSCM. Contributed by Nanda kumar

Nanda kumar 6 年之前
父节点
当前提交
b0a659c8c0

+ 2 - 1
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");
     out.println(USAGE + "\n");
   }
   }
 
 
-  public static StorageContainerManager createSCM(String[] argv,
+  public static StorageContainerManager createSCM(String[] args,
       OzoneConfiguration conf)
       OzoneConfiguration conf)
       throws IOException {
       throws IOException {
+    String[] argv = (args == null) ? new String[0] : args;
     if (!HddsUtils.isHddsEnabled(conf)) {
     if (!HddsUtils.isHddsEnabled(conf)) {
       System.err.println(
       System.err.println(
           "SCM cannot be started in secure mode or when " + OZONE_ENABLED + "" +
           "SCM cannot be started in secure mode or when " + OZONE_ENABLED + "" +