You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@asterixdb.apache.org by "Till Westmann (Code Review)" <do...@asterixdb.incubator.apache.org> on 2017/03/10 09:18:24 UTC
Change in asterixdb[master]: Avoid escaping HTML entities in error messages
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>
Change in asterixdb[master]: Avoid escaping HTML entities in error messages
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: Avoid escaping HTML entities in error messages
......................................................................
Patch Set 2:
BAD Compatibility Tests Started https://asterix-jenkins.ics.uci.edu/job/asterixbad-compat/765/
--
To view, visit https://asterix-gerrit.ics.uci.edu/1568
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I385cad8f2fa28a9ae368e0e59b5257fa6325ac42
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann <ti...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-HasComments: No
Change in asterixdb[master]: Avoid escaping HTML entities in error messages
Posted by "Yingyi Bu (Code Review)" <do...@asterixdb.incubator.apache.org>.
Yingyi Bu has submitted this change and it was merged.
Change subject: Avoid escaping HTML entities in error messages
......................................................................
Avoid escaping HTML entities in error messages
Change-Id: I385cad8f2fa28a9ae368e0e59b5257fa6325ac42
Reviewed-on: https://asterix-gerrit.ics.uci.edu/1568
Sonar-Qube: Jenkins <je...@fulliautomatix.ics.uci.edu>
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Integration-Tests: Jenkins <je...@fulliautomatix.ics.uci.edu>
Reviewed-by: Yingyi Bu <bu...@gmail.com>
---
M asterixdb/asterix-app/src/main/java/org/apache/asterix/app/result/ResultUtil.java
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Yingyi Bu: Looks good to me, approved
Jenkins: Verified; No violations found; Verified
Objections:
Jenkins: Violations found
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..b730989 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
@@ -115,8 +115,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: merged
Gerrit-Change-Id: I385cad8f2fa28a9ae368e0e59b5257fa6325ac42
Gerrit-PatchSet: 3
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann <ti...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Xikui Wang <xk...@gmail.com>
Gerrit-Reviewer: Yingyi Bu <bu...@gmail.com>
Change in asterixdb[master]: Avoid escaping HTML entities in error messages
Posted by "Yingyi Bu (Code Review)" <do...@asterixdb.incubator.apache.org>.
Yingyi Bu has posted comments on this change.
Change subject: Avoid escaping HTML entities in error messages
......................................................................
Patch Set 2: Code-Review+2
--
To view, visit https://asterix-gerrit.ics.uci.edu/1568
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I385cad8f2fa28a9ae368e0e59b5257fa6325ac42
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann <ti...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Xikui Wang <xk...@gmail.com>
Gerrit-Reviewer: Yingyi Bu <bu...@gmail.com>
Gerrit-HasComments: No
Change in asterixdb[master]: Avoid escaping HTML entities in error messages
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: Avoid escaping HTML entities in error messages
......................................................................
Patch Set 2:
Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/4623/
--
To view, visit https://asterix-gerrit.ics.uci.edu/1568
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I385cad8f2fa28a9ae368e0e59b5257fa6325ac42
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann <ti...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-HasComments: No
Change in asterixdb[master]: Avoid escaping HTML entities in error messages
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: Avoid escaping HTML entities in error messages
......................................................................
Patch Set 2:
Integration Tests Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/2153/
--
To view, visit https://asterix-gerrit.ics.uci.edu/1568
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I385cad8f2fa28a9ae368e0e59b5257fa6325ac42
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann <ti...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-HasComments: No
Change in asterixdb[master]: Avoid escaping HTML entities in error messages
Posted by "Till Westmann (Code Review)" <do...@asterixdb.incubator.apache.org>.
Till Westmann has uploaded a new patch set (#2).
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, 2 insertions(+), 2 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/68/1568/2
--
To view, visit https://asterix-gerrit.ics.uci.edu/1568
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I385cad8f2fa28a9ae368e0e59b5257fa6325ac42
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann <ti...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Change in asterixdb[master]: Avoid escaping HTML entities in error messages
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: Avoid escaping HTML entities in error messages
......................................................................
Patch Set 2: Integration-Tests+1
Integration Tests Successful
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/2153/ : SUCCESS
--
To view, visit https://asterix-gerrit.ics.uci.edu/1568
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I385cad8f2fa28a9ae368e0e59b5257fa6325ac42
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann <ti...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Xikui Wang <xk...@gmail.com>
Gerrit-HasComments: No
Change in asterixdb[master]: Avoid escaping HTML entities in error messages
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: Avoid escaping HTML entities in error messages
......................................................................
Patch Set 2: BAD-1
BAD Compatibility Tests Failed
https://asterix-jenkins.ics.uci.edu/job/asterixbad-compat/765/ : FAILURE
--
To view, visit https://asterix-gerrit.ics.uci.edu/1568
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I385cad8f2fa28a9ae368e0e59b5257fa6325ac42
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann <ti...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-HasComments: No
Change in asterixdb[master]: Avoid escaping HTML entities in error messages
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: Avoid escaping HTML entities in error messages
......................................................................
Patch Set 1:
Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/4622/
--
To view, visit https://asterix-gerrit.ics.uci.edu/1568
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I385cad8f2fa28a9ae368e0e59b5257fa6325ac42
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann <ti...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-HasComments: No