Browse Source

AMBARI-8570. Deploy stacks fails with NPE in ambari-server.log (alexantonenko)

Alex Antonenko 10 years ago
parent
commit
1e94bc1abf

+ 7 - 6
ambari-web/app/controllers/wizard/step8_controller.js

@@ -461,12 +461,13 @@ App.WizardStep8Controller = Em.Controller.extend(App.AddSecurityConfigs, App.wiz
     var dependentConfig = $.extend(true, [], configMapping.filterProperty('foreignKey'));
     dependentConfig.forEach(function (_config) {
       App.config.setConfigValue(uiConfig, this.get('content.serviceConfigProperties'), _config);
-      uiConfig.pushObject({
-        "id": "site property",
-        "name": _config._name || _config.name,
-        "value": _config.value,
-        "filename": _config.filename
-      });
+      if(!_config.noMatchSoSkipThisConfig)
+        uiConfig.pushObject({
+          "id": "site property",
+          "name": _config._name || _config.name,
+          "value": _config.value,
+          "filename": _config.filename
+        });
     }, this);
     return uiConfig;
   },

+ 2 - 0
ambari-web/app/utils/config.js

@@ -1193,6 +1193,8 @@ App.config = Em.Object.create({
             globalValue = allConfigs.findProperty('name', config.foreignKey[index]).value;
           }
           config._name = config.name.replace(_fkName, globalValue);
+        }else{
+          config.noMatchSoSkipThisConfig = true;
         }
       }, this);
     }