Repository: asterixdb Updated Branches: refs/heads/master dd920be6e -> 494cfd199
Fix QueryCancellationServlet use of e.getMessage() Correct log message to not utilize getMessage() on arbitrary exceptions Change-Id: I1f5e2172728d3bc4d0cc4a9990518adcd91ae76b Reviewed-on: https://asterix-gerrit.ics.uci.edu/1809 Sonar-Qube: Jenkins <[email protected]> Tested-by: Jenkins <[email protected]> Integration-Tests: Jenkins <[email protected]> BAD: Jenkins <[email protected]> Reviewed-by: Yingyi Bu <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/494cfd19 Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/494cfd19 Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/494cfd19 Branch: refs/heads/master Commit: 494cfd199ca49cedda78e1a1d079f27aabb458c0 Parents: dd920be Author: Michael Blow <[email protected]> Authored: Wed Jun 7 12:41:20 2017 -0400 Committer: Michael Blow <[email protected]> Committed: Wed Jun 7 17:21:11 2017 -0700 ---------------------------------------------------------------------- .../apache/asterix/api/http/server/QueryCancellationServlet.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/494cfd19/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryCancellationServlet.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryCancellationServlet.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryCancellationServlet.java index 4405d29..bfec146 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryCancellationServlet.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryCancellationServlet.java @@ -72,9 +72,7 @@ public class QueryCancellationServlet extends AbstractServlet { // response: OK response.setStatus(HttpResponseStatus.OK); } catch (Exception e) { - if (LOGGER.isLoggable(Level.WARNING)) { - LOGGER.log(Level.WARNING, e.getMessage(), e); - } + LOGGER.log(Level.WARNING, "unexpected exception thrown from cancel", e); // response: INTERNAL SERVER ERROR response.setStatus(HttpResponseStatus.INTERNAL_SERVER_ERROR); }
