HDDS-456. TestOzoneShell#init is breaking due to Null Pointer Exception. Contributed by Dinesh Chitlangia.

2018-09-13 13:00:35 -07:00 · 2018-09-13 13:00:35 -07:00 · 76a0fdfed9
parent 2886024ac3
commit 76a0fdfed9
1 changed files with 3 additions and 0 deletions
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
@ -305,6 +305,9 @@ public final class OzoneManager extends ServiceRuntimeInfoImpl
      terminate(0);
      return null;
    default:
+      if (argv == null) {
+        argv = new String[]{};
+      }
      StringUtils.startupShutdownMessage(OzoneManager.class, argv, LOG);
      return new OzoneManager(conf);
    }