commit a5843a277504d33589888e2a9b1c1fb869de2109
author Abdullah Alamoudi <bamousaa@gmail.com> Sat Aug 26 20:17:38 2017 -0700
committer abdullah alamoudi <bamousaa@gmail.com> Sun Aug 27 08:12:20 2017 -0700
tree ba5d179b332439ae3b6904896235989f9f282fca
parent 00ce8748cd68ba0ffa3dd74b5c1b976d054a19ca

[NO ISSUE][OTH] Cancel Query on interrupt

- user model changes: no
- storage format changes: no
- interface changes: no

details:
- Cancel queries that are submitted through NC query service in
  the event of interrupt.

Change-Id: I287f8f605afe432b4459ae536941e4708dac18af
Reviewed-on: https://asterix-gerrit.ics.uci.edu/1976
Sonar-Qube: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Reviewed-by: Xikui Wang <xkkwww@gmail.com>
Integration-Tests: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Tested-by: Jenkins <jenkins@fulliautomatix.ics.uci.edu>

asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/NCQueryServiceServlet.java

diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/NCQueryServiceServlet.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/NCQueryServiceServlet.java
index ef49c35..69e995b 100644
--- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/NCQueryServiceServlet.java
+++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/NCQueryServiceServlet.java
@@ -85,7 +85,7 @@
             try {
                 responseMsg = (ExecuteStatementResponseMessage) responseFuture.get(timeout,
                         java.util.concurrent.TimeUnit.MILLISECONDS);
-            } catch (TimeoutException exception) {
+            } catch (InterruptedException | TimeoutException exception) {
                 RuntimeDataException hde = new RuntimeDataException(ErrorCode.QUERY_TIMEOUT, exception);
                 // cancel query
                 cancelQuery(ncMb, ncCtx.getNodeId(), param.clientContextID, hde);