tajo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hyun...@apache.org
Subject git commit: TAJO-832: NPE occurs when Exception's message is null in Task. (Hyoungjun Kim via hyunsik)
Date Wed, 21 May 2014 03:01:00 GMT
Repository: tajo
Updated Branches:
  refs/heads/master 5f9330b10 -> 76a5e077c


TAJO-832: NPE occurs when Exception's message is null in Task. (Hyoungjun Kim via hyunsik)


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

Branch: refs/heads/master
Commit: 76a5e077cd6300afd9c23014f72443a624789291
Parents: 5f9330b
Author: Hyunsik Choi <hyunsik@apache.org>
Authored: Wed May 21 12:00:40 2014 +0900
Committer: Hyunsik Choi <hyunsik@apache.org>
Committed: Wed May 21 12:00:40 2014 +0900

----------------------------------------------------------------------
 CHANGES                                                  | 3 +++
 tajo-core/src/main/java/org/apache/tajo/worker/Task.java | 6 +++++-
 2 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tajo/blob/76a5e077/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 3d1ec45..382bd09 100644
--- a/CHANGES
+++ b/CHANGES
@@ -41,6 +41,9 @@ Release 0.9.0 - unreleased
 
   BUG FIXES
  
+    TAJO-832: NPE occurs when Exception's message is null in Task. 
+    (Hyoungjun Kim via hyunsik)
+
     TAJO-833: NPE occurs when using the column as a alias name in the multiple 
     DISTINCT. (Hyoungjun Kim via hyunsik)
 

http://git-wip-us.apache.org/repos/asf/tajo/blob/76a5e077/tajo-core/src/main/java/org/apache/tajo/worker/Task.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/worker/Task.java b/tajo-core/src/main/java/org/apache/tajo/worker/Task.java
index 5c252fd..4010faf 100644
--- a/tajo-core/src/main/java/org/apache/tajo/worker/Task.java
+++ b/tajo-core/src/main/java/org/apache/tajo/worker/Task.java
@@ -408,7 +408,11 @@ public class Task {
               TaskFatalErrorReport.newBuilder()
                   .setId(getId().getProto());
           if (error != null) {
-            errorBuilder.setErrorMessage(error.getMessage());
+            if (error.getMessage() == null) {
+              errorBuilder.setErrorMessage(error.getClass().getCanonicalName());
+            } else {
+              errorBuilder.setErrorMessage(error.getMessage());
+            }
             errorBuilder.setErrorTrace(ExceptionUtils.getStackTrace(error));
           }
 


Mime
View raw message