Repository: lens Updated Branches: refs/heads/master 0dfdaa9ec -> a89c1a696
LENS-1214 : Fix NPE in await termination for query service Project: http://git-wip-us.apache.org/repos/asf/lens/repo Commit: http://git-wip-us.apache.org/repos/asf/lens/commit/a89c1a69 Tree: http://git-wip-us.apache.org/repos/asf/lens/tree/a89c1a69 Diff: http://git-wip-us.apache.org/repos/asf/lens/diff/a89c1a69 Branch: refs/heads/master Commit: a89c1a6961d07b7beb80073a695981a9051047b6 Parents: 0dfdaa9 Author: Rajat Khandelwal <pro...@apache.org> Authored: Tue Jul 19 15:40:26 2016 +0530 Committer: Amareshwari Sriramadasu <amareshw...@apache.org> Committed: Tue Jul 19 15:40:26 2016 +0530 ---------------------------------------------------------------------- .../org/apache/lens/server/query/QueryExecutionServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lens/blob/a89c1a69/lens-server/src/main/java/org/apache/lens/server/query/QueryExecutionServiceImpl.java ---------------------------------------------------------------------- diff --git a/lens-server/src/main/java/org/apache/lens/server/query/QueryExecutionServiceImpl.java b/lens-server/src/main/java/org/apache/lens/server/query/QueryExecutionServiceImpl.java index 2de098d..924466b 100644 --- a/lens-server/src/main/java/org/apache/lens/server/query/QueryExecutionServiceImpl.java +++ b/lens-server/src/main/java/org/apache/lens/server/query/QueryExecutionServiceImpl.java @@ -1236,6 +1236,9 @@ public class QueryExecutionServiceImpl extends BaseLensService implements QueryE } private void awaitTermination(QueryResultPurger service) { + if (service == null) { + return; + } try { service.awaitTermination(1, TimeUnit.MINUTES); } catch (InterruptedException e) {
