Repository: tajo Updated Branches: refs/heads/master 3b0b68375 -> 6c3ae723f
TAJO-1964: TestKillQuery::testKillQueryFromInitState causes NPE. Closes #847 Project: http://git-wip-us.apache.org/repos/asf/tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/6c3ae723 Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/6c3ae723 Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/6c3ae723 Branch: refs/heads/master Commit: 6c3ae723f4613d36d05a76d01cd394aa788857ba Parents: 3b0b683 Author: Jinho Kim <[email protected]> Authored: Fri Nov 6 12:21:06 2015 +0900 Committer: Jinho Kim <[email protected]> Committed: Fri Nov 6 12:22:33 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/6c3ae723/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index 4be9ebf..f8360f9 100644 --- a/CHANGES +++ b/CHANGES @@ -33,6 +33,8 @@ Release 0.12.0 - 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/6c3ae723/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 574c41f..f45f64d 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());
