tez-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hit...@apache.org
Subject git commit: TEZ-616. Addendum patch for OrderedWordCount with -generateSplitsInClient true throws NPE. (hitesh)
Date Fri, 22 Nov 2013 00:55:28 GMT
Updated Branches:
  refs/heads/master 6ccebe747 -> 7b2a0e6f3


TEZ-616. Addendum patch for OrderedWordCount with -generateSplitsInClient true throws NPE.
(hitesh)


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

Branch: refs/heads/master
Commit: 7b2a0e6f3427182e0c7d55f3da1c369500770ab0
Parents: 6ccebe7
Author: Hitesh Shah <hitesh@apache.org>
Authored: Thu Nov 21 16:55:03 2013 -0800
Committer: Hitesh Shah <hitesh@apache.org>
Committed: Thu Nov 21 16:55:21 2013 -0800

----------------------------------------------------------------------
 tez-api/src/main/java/org/apache/tez/client/TezClientUtils.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/7b2a0e6f/tez-api/src/main/java/org/apache/tez/client/TezClientUtils.java
----------------------------------------------------------------------
diff --git a/tez-api/src/main/java/org/apache/tez/client/TezClientUtils.java b/tez-api/src/main/java/org/apache/tez/client/TezClientUtils.java
index df15b53..c415f8a 100644
--- a/tez-api/src/main/java/org/apache/tez/client/TezClientUtils.java
+++ b/tez-api/src/main/java/org/apache/tez/client/TezClientUtils.java
@@ -373,7 +373,9 @@ public class TezClientUtils {
         if (v.getTaskLocalResources() == null) {
           v.setTaskLocalResources(new TreeMap<String, LocalResource>());
         }
-        v.getTaskLocalResources().putAll(tezJarResources);
+        if (tezJarResources != null) {
+          v.getTaskLocalResources().putAll(tezJarResources);
+        }
         v.getTaskLocalResources().put(TezConfiguration.TEZ_PB_BINARY_CONF_NAME,
             binaryConfLRsrc);
 


Mime
View raw message