You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tajo.apache.org by hy...@apache.org on 2014/03/04 00:11:31 UTC

git commit: TAJO-645: Task.Reporter can cause NPE during reporting.

Repository: incubator-tajo
Updated Branches:
  refs/heads/master 15c4576ef -> f4a9fd183


TAJO-645: Task.Reporter can cause NPE during reporting.


Project: http://git-wip-us.apache.org/repos/asf/incubator-tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tajo/commit/f4a9fd18
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tajo/tree/f4a9fd18
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tajo/diff/f4a9fd18

Branch: refs/heads/master
Commit: f4a9fd183b5a4a61eef82e570215303ee4f10f0b
Parents: 15c4576
Author: Hyunsik Choi <hy...@apache.org>
Authored: Tue Mar 4 08:11:17 2014 +0900
Committer: Hyunsik Choi <hy...@apache.org>
Committed: Tue Mar 4 08:11:17 2014 +0900

----------------------------------------------------------------------
 CHANGES.txt                                                     | 2 ++
 .../src/main/java/org/apache/tajo/worker/Task.java              | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/f4a9fd18/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 128ed99..fc76b0f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -269,6 +269,8 @@ Release 0.8.0 - unreleased
 
   BUG FIXES
 
+    TAJO-645: Task.Reporter can cause NPE during reporting. (hyunsik)
+
     TAJO-630: QueryMasterTask never finished when Internal error occurs.
     (hyunsik)
 

http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/f4a9fd18/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/worker/Task.java
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/worker/Task.java b/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/worker/Task.java
index 56e5391..c542afb 100644
--- a/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/worker/Task.java
+++ b/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/worker/Task.java
@@ -136,8 +136,6 @@ public class Task {
               final QueryUnitRequest request) throws IOException {
     this.request = request;
     this.taskId = taskId;
-    this.reporter = new Reporter(taskId, masterProxy);
-    this.reporter.startCommunicationThread();
 
     this.systemConf = worker.getConf();
     this.queryContext = request.getQueryContext();
@@ -154,6 +152,9 @@ public class Task {
     this.context.setEnforcer(request.getEnforcer());
     this.inputStats = new TableStats();
 
+    this.reporter = new Reporter(taskId, masterProxy);
+    this.reporter.startCommunicationThread();
+
     plan = CoreGsonHelper.fromJson(request.getSerializedData(), LogicalNode.class);
     LogicalNode [] scanNode = PlannerUtil.findAllNodes(plan, NodeType.SCAN);
     for (LogicalNode node : scanNode) {