ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vbrodets...@apache.org
Subject ambari git commit: AMBARI-13146. Do not add new properties from stack, during upgrade, if vlaue = null.(vbrodetskyi)
Date Fri, 18 Sep 2015 15:26:52 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 8aaa779d0 -> 5cdbecc4a


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/5cdbecc4
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5cdbecc4
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5cdbecc4

Branch: refs/heads/branch-2.1
Commit: 5cdbecc4a4a435e9ade758d8206aae284001dcb5
Parents: 8aaa779
Author: Vitaly Brodetskyi <vbrodetskyi@hortonworks.com>
Authored: Fri Sep 18 18:26:38 2015 +0300
Committer: Vitaly Brodetskyi <vbrodetskyi@hortonworks.com>
Committed: Fri Sep 18 18:26:38 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/5cdbecc4/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;
               }
 


Mime
View raw message