tez git commit: TEZ-2437. FilterLinesByWord NPEs when run in Localmode (zjffdu)

[zjffdu]

Repository: tez
Updated Branches:
  refs/heads/branch-0.6 d72cd949d -> 3eb8f60aa


TEZ-2437. FilterLinesByWord NPEs when run in Localmode (zjffdu)

(cherry picked from commit fac3222c768fbdfc8c1bbe55f94bc106900e6ae4)

Conflicts:
        CHANGES.txt


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

Branch: refs/heads/branch-0.6
Commit: 3eb8f60aaf0d0c247097c680982865a6b8bdcd4d
Parents: d72cd94
Author: Jeff Zhang <zjf...@apache.org>
Authored: Thu May 14 12:54:57 2015 +0800
Committer: Jeff Zhang <zjf...@apache.org>
Committed: Thu May 14 12:59:20 2015 +0800

----------------------------------------------------------------------
 CHANGES.txt                                                  | 1 +
 tez-dag/src/main/java/org/apache/tez/client/LocalClient.java | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tez/blob/3eb8f60a/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index f16d278..f813f06 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,7 @@ Release 0.6.1: Unreleased
 INCOMPATIBLE CHANGES
 
 ALL CHANGES:
+  TEZ-2437. FilterLinesByWord NPEs when run in Localmode
   TEZ-2057. tez-dag/pom.xml contains versions for dependencies.
   TEZ-2282. Delimit reused yarn container logs (stderr, stdout, syslog) with 
task attempt start/stop events
   TEZ-2396. pig-tez-tfile-parser pom is hard coded to depend on 0.6.0-SNAPSHOT 
version.

http://git-wip-us.apache.org/repos/asf/tez/blob/3eb8f60a/tez-dag/src/main/java/org/apache/tez/client/LocalClient.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/client/LocalClient.java 
b/tez-dag/src/main/java/org/apache/tez/client/LocalClient.java
index 2f8da9c..dca9778 100644
--- a/tez-dag/src/main/java/org/apache/tez/client/LocalClient.java
+++ b/tez-dag/src/main/java/org/apache/tez/client/LocalClient.java
@@ -112,7 +112,6 @@ public class LocalClient extends FrameworkClient {
     // the TezClient is stopped, in order not to leak.
     if (dagAppMaster != null) {
       dagAppMaster.stop();
-      dagAppMaster = null;
     }
   }