You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ja...@apache.org on 2014/05/28 04:05:26 UTC
git commit: AMBARI-5908. Enable Security: Invalid configurations are
applied resulting in datanode start failure. (jaimin)
Repository: ambari
Updated Branches:
refs/heads/trunk 889675b58 -> 709f3d6cd
AMBARI-5908. Enable Security: Invalid configurations are applied resulting in datanode start failure. (jaimin)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/709f3d6c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/709f3d6c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/709f3d6c
Branch: refs/heads/trunk
Commit: 709f3d6cd532949364db27af6ef94765108353b9
Parents: 889675b
Author: Jaimin Jetly <ja...@hortonworks.com>
Authored: Tue May 27 19:05:04 2014 -0700
Committer: Jaimin Jetly <ja...@hortonworks.com>
Committed: Tue May 27 19:05:04 2014 -0700
----------------------------------------------------------------------
ambari-web/app/controllers/main/admin/security/add/step4.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/709f3d6c/ambari-web/app/controllers/main/admin/security/add/step4.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/security/add/step4.js b/ambari-web/app/controllers/main/admin/security/add/step4.js
index f7fba39..df25dd3 100644
--- a/ambari-web/app/controllers/main/admin/security/add/step4.js
+++ b/ambari-web/app/controllers/main/admin/security/add/step4.js
@@ -249,14 +249,14 @@ App.MainAdminSecurityAddStep4Controller = App.MainAdminSecurityProgressControlle
if (typeof expression !== 'string') return null;
var express = expression.match(/<(.*?)>/g);
- var value = null;
+ var value = expression;
if (Em.isNone(express)) return expression;
express.forEach(function (_express) {
var index = parseInt(_express.match(/\[([\d]*)(?=\])/)[1]);
var globalConfig = this.get('globalProperties').findProperty('name', templateName[index]);
- value = (globalConfig) ? expression.replace(_express, globalConfig.value) : null;
+ value = (globalConfig) ? value.replace(_express, globalConfig.value) : null;
}, this);
return value;
},