tez-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ss...@apache.org
Subject tez git commit: TEZ-2257. Fix potential NPEs in TaskReporter. (sseth) (cherry picked from commit 61764323798385ec8d8103db2d4dcc24c2ebd1ae)
Date Tue, 07 Apr 2015 19:53:36 GMT
Repository: tez
Updated Branches:
  refs/heads/branch-0.6 3965c7acc -> 282e63af1


TEZ-2257. Fix potential NPEs in TaskReporter. (sseth)
(cherry picked from commit 61764323798385ec8d8103db2d4dcc24c2ebd1ae)


Project: http://git-wip-us.apache.org/repos/asf/tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/282e63af
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/282e63af
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/282e63af

Branch: refs/heads/branch-0.6
Commit: 282e63af187f59700191579d2328cae3b8d2fa9c
Parents: 3965c7a
Author: Siddharth Seth <sseth@apache.org>
Authored: Tue Apr 7 12:52:33 2015 -0700
Committer: Siddharth Seth <sseth@apache.org>
Committed: Tue Apr 7 12:53:26 2015 -0700

----------------------------------------------------------------------
 CHANGES.txt                                                    | 1 +
 .../main/java/org/apache/tez/runtime/task/TaskReporter.java    | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tez/blob/282e63af/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 47260a9..e719e10 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -173,6 +173,7 @@ TEZ-UI CHANGES (TEZ-8):
 Release 0.5.4: Unreleased
 
 ALL CHANGES:
+  TEZ-2257. Fix potential NPEs in TaskReporter.
   TEZ-2192. Relocalization does not check for source.
   TEZ-2224. EventQueue empty doesn't mean events are consumed in RecoveryService
   TEZ-2240. Fix toUpperCase/toLowerCase to use Locale.ENGLISH.

http://git-wip-us.apache.org/repos/asf/tez/blob/282e63af/tez-dag/src/main/java/org/apache/tez/runtime/task/TaskReporter.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/runtime/task/TaskReporter.java b/tez-dag/src/main/java/org/apache/tez/runtime/task/TaskReporter.java
index 15dcbb0..defc6bd 100644
--- a/tez-dag/src/main/java/org/apache/tez/runtime/task/TaskReporter.java
+++ b/tez-dag/src/main/java/org/apache/tez/runtime/task/TaskReporter.java
@@ -372,16 +372,16 @@ public class TaskReporter {
     }
   }
 
-  public boolean taskSucceeded(TezTaskAttemptID taskAttemptID) throws IOException, TezException
{
+  public synchronized boolean taskSucceeded(TezTaskAttemptID taskAttemptID) throws IOException,
TezException {
     return currentCallable.taskSucceeded(taskAttemptID);
   }
 
-  public boolean taskFailed(TezTaskAttemptID taskAttemptID, Throwable t, String diagnostics,
+  public synchronized boolean taskFailed(TezTaskAttemptID taskAttemptID, Throwable t, String
diagnostics,
       EventMetaData srcMeta) throws IOException, TezException {
     return currentCallable.taskFailed(taskAttemptID, t, diagnostics, srcMeta);
   }
 
-  public void addEvents(TezTaskAttemptID taskAttemptID, Collection<TezEvent> events)
{
+  public synchronized void addEvents(TezTaskAttemptID taskAttemptID, Collection<TezEvent>
events) {
     currentCallable.addEvents(taskAttemptID, events);
   }
 


Mime
View raw message