Change in asterixdb[master]: Avoid escaping HTML entities in error messages

[Till Westmann (Code Review)]

Till Westmann has uploaded a new change for review.

  https://asterix-gerrit.ics.uci.edu/1568

Change subject: Avoid escaping HTML entities in error messages
......................................................................

Avoid escaping HTML entities in error messages

Change-Id: I385cad8f2fa28a9ae368e0e59b5257fa6325ac42
---
M 
asterixdb/asterix-app/src/main/java/org/apache/asterix/app/result/ResultUtil.java
1 file changed, 7 insertions(+), 5 deletions(-)


  git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb 
refs/changes/68/1568/1

diff --git 
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/result/ResultUtil.java
 
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/result/ResultUtil.java
index 3afb653..a87f5ba 100644
--- 
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/result/ResultUtil.java
+++ 
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/result/ResultUtil.java
@@ -65,9 +65,11 @@
      */
     public static String escapeHTML(String aString) {
         String escaped = aString;
-        for (Entry<Character, String> entry : HTML_ENTITIES.entrySet()) {
-            if (escaped.indexOf(entry.getKey()) >= 0) {
-                escaped = escaped.replace(entry.getKey().toString(), 
entry.getValue());
+        if (false) {
+            for (Entry<Character, String> entry : HTML_ENTITIES.entrySet()) {
+                if (escaped.indexOf(entry.getKey()) >= 0) {
+                    escaped = escaped.replace(entry.getKey().toString(), 
entry.getValue());
+                }
             }
         }
         return escaped;
@@ -115,8 +117,8 @@
     public static void webUIErrorHandler(PrintWriter out, Exception e) {
         String errorTemplate = readTemplateFile("/webui/errortemplate.html", 
"%s\n%s\n%s");
 
-        String errorOutput = String.format(errorTemplate, 
escapeHTML(extractErrorMessage(e)),
-                escapeHTML(extractErrorSummary(e)), 
escapeHTML(extractFullStackTrace(e)));
+        String errorOutput =
+                String.format(errorTemplate, extractErrorMessage(e), 
extractErrorSummary(e), extractFullStackTrace(e));
         out.println(errorOutput);
     }
 

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1568
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I385cad8f2fa28a9ae368e0e59b5257fa6325ac42
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann <ti...@apache.org>