AMBARI-21208 - Upgrade PreUpgradeCheck NullPointerException (wang yaoxin via jonathanhurley)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8e7654a7 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8e7654a7 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8e7654a7 Branch: refs/heads/branch-feature-AMBARI-14714 Commit: 8e7654a7a338ed0151db2ee0b7827495f146e90b Parents: b4966c1 Author: Jonathan Hurley <[email protected]> Authored: Wed Oct 4 11:23:57 2017 -0400 Committer: Jonathan Hurley <[email protected]> Committed: Wed Oct 4 11:23:57 2017 -0400 ---------------------------------------------------------------------- .../java/org/apache/ambari/server/state/stack/UpgradePack.java | 6 ++++++ 1 file changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/8e7654a7/ambari-server/src/main/java/org/apache/ambari/server/state/stack/UpgradePack.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/UpgradePack.java b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/UpgradePack.java index 8662958..256b71d 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/UpgradePack.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/UpgradePack.java @@ -148,6 +148,9 @@ public class UpgradePack { * @return the preCheck name, e.g. "CheckDescription" */ public List<String> getPrerequisiteChecks() { + if (prerequisiteChecks == null) { + return new ArrayList<String>(); + } return new ArrayList<>(prerequisiteChecks.checks); } @@ -156,6 +159,9 @@ public class UpgradePack { * @return the prerequisite check configuration */ public PrerequisiteCheckConfig getPrerequisiteCheckConfig() { + if (prerequisiteChecks == null) { + return new PrerequisiteCheckConfig(); + } return prerequisiteChecks.configuration; }
