Repository: tajo Updated Branches: refs/heads/branch-0.11.1 24b8e891e -> 2c763b42f
TAJO-1964: TestKillQuery::testKillQueryFromInitState causes NPE. Project: http://git-wip-us.apache.org/repos/asf/tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/2c763b42 Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/2c763b42 Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/2c763b42 Branch: refs/heads/branch-0.11.1 Commit: 2c763b42fbc276c8b6e5e8b560437925ac0b0a40 Parents: 24b8e89 Author: Jinho Kim <[email protected]> Authored: Fri Nov 6 12:25:18 2015 +0900 Committer: Jinho Kim <[email protected]> Committed: Fri Nov 6 12:25:18 2015 +0900 ---------------------------------------------------------------------- CHANGES | 2 ++ .../java/org/apache/tajo/querymaster/DefaultTaskScheduler.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/2c763b42/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index bf58419..dccf6ed 100644 --- a/CHANGES +++ b/CHANGES @@ -12,6 +12,8 @@ Release 0.11.1 - unreleased BUG FIXES + TAJO-1964: TestKillQuery::testKillQueryFromInitState causes NPE. (jinho) + TAJO-1578: User configuration for pull server port is ignored. (Contributed by Dongkyu Hwangbo, committed by jihoon) http://git-wip-us.apache.org/repos/asf/tajo/blob/2c763b42/tajo-core/src/main/java/org/apache/tajo/querymaster/DefaultTaskScheduler.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/querymaster/DefaultTaskScheduler.java b/tajo-core/src/main/java/org/apache/tajo/querymaster/DefaultTaskScheduler.java index 25695a5..56f8829 100644 --- a/tajo-core/src/main/java/org/apache/tajo/querymaster/DefaultTaskScheduler.java +++ b/tajo-core/src/main/java/org/apache/tajo/querymaster/DefaultTaskScheduler.java @@ -329,7 +329,7 @@ public class DefaultTaskScheduler extends AbstractTaskScheduler { } public void releaseTaskAttempt(TaskAttempt taskAttempt) { - if (taskAttempt.isLeafTask() && taskAttempt.getWorkerConnectionInfo() != null) { + if (taskAttempt != null && taskAttempt.isLeafTask() && taskAttempt.getWorkerConnectionInfo() != null) { HostVolumeMapping mapping = scheduledRequests.leafTaskHostMapping.get(taskAttempt.getWorkerConnectionInfo().getHost());
