Repository: hadoop
Updated Branches:
  refs/heads/ozone-0.2 530029809 -> 9ba7ce957
  refs/heads/trunk 2886024ac -> 76a0fdfed


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


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/76a0fdfe
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/76a0fdfe
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/76a0fdfe

Branch: refs/heads/trunk
Commit: 76a0fdfed9e3b972e0904503dcb0901c546c1d8c
Parents: 2886024
Author: Arpit Agarwal <[email protected]>
Authored: Thu Sep 13 13:00:35 2018 -0700
Committer: Arpit Agarwal <[email protected]>
Committed: Thu Sep 13 13:00:35 2018 -0700

----------------------------------------------------------------------
 .../src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java    | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/76a0fdfe/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
----------------------------------------------------------------------
diff --git 
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
index b5bd361..71cc6ba 100644
--- 
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);
     }


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to