浏览代码

AMBARI-4883 Editing log4j.properties causes services to fail. (atkach)

atkach 11 年之前
父节点
当前提交
6627144d4c
共有 2 个文件被更改,包括 4 次插入1 次删除
  1. 3 0
      ambari-web/app/controllers/main/service/info/configs.js
  2. 1 1
      ambari-web/app/utils/config.js

+ 3 - 0
ambari-web/app/controllers/main/service/info/configs.js

@@ -1446,6 +1446,9 @@ App.MainServiceInfoConfigsController = Em.Controller.extend({
       case 'storm.zookeeper.servers':
         return JSON.stringify(value).replace(/"/g, "'");
         break;
+      case 'content':
+        return value;
+        break;
       default:
         return App.config.escapeXMLCharacters(value);
     }

+ 1 - 1
ambari-web/app/utils/config.js

@@ -60,7 +60,7 @@ App.config = Em.Object.create({
    */
   escapeXMLCharacters: function(value) {
     var self = this;
-    // To prevent double/triple replacing '>' to '>gt;' to '>gt;gt', we need
+    // To prevent double/triple replacing '>' to '>' to '>', we need
     // to first unescape all XML chars, and then escape them again.
     var newValue = String(value).replace(/(&|<|>|"|')/g, function (s) {
       return self.xmlUnEscapeMap[s];