You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by vb...@apache.org on 2015/09/18 17:25:46 UTC
ambari git commit: AMBARI-13146. Do not add new properties from stack,
during upgrade, if vlaue = null.(vbrodetskyi)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1.2 e68bb1a79 -> 945a7f77b
AMBARI-13146. Do not add new properties from stack, during upgrade, if vlaue = null.(vbrodetskyi)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/945a7f77
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/945a7f77
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/945a7f77
Branch: refs/heads/branch-2.1.2
Commit: 945a7f77bfe9d674076104a602069b9a73a67a21
Parents: e68bb1a
Author: Vitaly Brodetskyi <vb...@hortonworks.com>
Authored: Fri Sep 18 18:25:15 2015 +0300
Committer: Vitaly Brodetskyi <vb...@hortonworks.com>
Committed: Fri Sep 18 18:25:15 2015 +0300
----------------------------------------------------------------------
.../org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/945a7f77/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java
index 2dfdc17..f4023b2 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java
@@ -284,7 +284,7 @@ public abstract class AbstractUpgradeCatalog implements UpgradeCatalog {
String configType = ConfigHelper.fileNameToConfigType(property.getFilename());
Config clusterConfigs = cluster.getDesiredConfigByType(configType);
if(clusterConfigs == null || !clusterConfigs.getProperties().containsKey(property.getName())) {
- if (!checkAccordingToStackAdvisor(property, cluster)) {
+ if (!checkAccordingToStackAdvisor(property, cluster) || property.getValue() == null) {
continue;
}