Repository: ambari Updated Branches: refs/heads/trunk b42150cad -> 1e94bc1ab
AMBARI-8570. Deploy stacks fails with NPE in ambari-server.log (alexantonenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1e94bc1a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1e94bc1a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1e94bc1a Branch: refs/heads/trunk Commit: 1e94bc1abf647a53450dcd9f8251bee185bb92bf Parents: b42150c Author: Alex Antonenko <[email protected]> Authored: Fri Dec 5 22:56:08 2014 +0200 Committer: Alex Antonenko <[email protected]> Committed: Fri Dec 5 22:56:08 2014 +0200 ---------------------------------------------------------------------- ambari-web/app/controllers/wizard/step8_controller.js | 13 +++++++------ ambari-web/app/utils/config.js | 2 ++ 2 files changed, 9 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/1e94bc1a/ambari-web/app/controllers/wizard/step8_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/wizard/step8_controller.js b/ambari-web/app/controllers/wizard/step8_controller.js index 2254198..5d02440 100644 --- a/ambari-web/app/controllers/wizard/step8_controller.js +++ b/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; }, http://git-wip-us.apache.org/repos/asf/ambari/blob/1e94bc1a/ambari-web/app/utils/config.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/utils/config.js b/ambari-web/app/utils/config.js index dc675e7..01aef1a 100644 --- a/ambari-web/app/utils/config.js +++ b/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); }
