Repository: ambari Updated Branches: refs/heads/trunk 4e714d4f4 -> 008503e12
AMBARI-15194: Auto-start services - Create default settings for auto start Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/008503e1 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/008503e1 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/008503e1 Branch: refs/heads/trunk Commit: 008503e128f9cbe34eda24ac47f7804c0fde5e35 Parents: 4e714d4 Author: Nahappan Somasundaram <[email protected]> Authored: Wed Mar 2 11:36:45 2016 -0800 Committer: Nahappan Somasundaram <[email protected]> Committed: Thu Mar 3 07:45:27 2016 -0800 ---------------------------------------------------------------------- .../apache/ambari/server/state/ComponentInfo.java | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/008503e1/ambari-server/src/main/java/org/apache/ambari/server/state/ComponentInfo.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/ComponentInfo.java b/ambari-server/src/main/java/org/apache/ambari/server/state/ComponentInfo.java index 94c8053..770ee5c 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/ComponentInfo.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/ComponentInfo.java @@ -91,7 +91,7 @@ public class ComponentInfo { private AutoDeployInfo autoDeploy; @XmlElements(@XmlElement(name = "recovery_enabled")) - private Boolean recoveryEnabled = null; + private boolean recoveryEnabled = false; private String timelineAppid; @@ -260,19 +260,6 @@ public class ComponentInfo { } public boolean isRecoveryEnabled() { - /** - * If recovery_enabled was not provided, then use defaults: - * Slave components: recovery_enabled = true - * Master components: recovery_enabled = false - * All others: recovery_enabled = false - */ - if (recoveryEnabled == null) { - if (isSlave()) { - recoveryEnabled = true; - } else { - recoveryEnabled = false; - } - } return recoveryEnabled; }
