tez git commit: TEZ-3352. MRInputHelpers getStringProperty() should not fail if property value is null. (Prasanth Jayachandran via hitesh)

[hitesh]

Repository: tez
Updated Branches:
  refs/heads/branch-0.8 8a83cb900 -> 119c47621


TEZ-3352. MRInputHelpers getStringProperty() should not fail if property value 
is null. (Prasanth Jayachandran via hitesh)

(cherry picked from commit d3fd82832a890b49dd4955f36438dbb5230d9349)

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/119c4762
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/119c4762
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/119c4762

Branch: refs/heads/branch-0.8
Commit: 119c4762190d5ca6ac85cdca824a989abe6ff221
Parents: 8a83cb9
Author: Hitesh Shah <hit...@apache.org>
Authored: Tue Aug 16 14:14:24 2016 -0700
Committer: Hitesh Shah <hit...@apache.org>
Committed: Tue Aug 16 14:15:25 2016 -0700

----------------------------------------------------------------------
 CHANGES.txt                                                    | 1 +
 .../java/org/apache/tez/mapreduce/hadoop/MRInputHelpers.java   | 6 ++----
 2 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tez/blob/119c4762/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 24d203b..b78f48d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,6 +7,7 @@ INCOMPATIBLE CHANGES
 
 ALL CHANGES:
 
+  TEZ-3352. MRInputHelpers getStringProperty() should not fail if property 
value is null.
   TEZ-3409. Log dagId along with other information when submitting a dag.
   TEZ-3384. Fix 
TestATSV15HistoryLoggingService::testDAGGroupingGroupingEnabled unit test.
   TEZ-3376. Fix groupId generation to account for dagId starting with 1.

http://git-wip-us.apache.org/repos/asf/tez/blob/119c4762/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/MRInputHelpers.java
----------------------------------------------------------------------
diff --git 
a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/MRInputHelpers.java
 
b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/MRInputHelpers.java
index 2a806ab..6262e59 100644
--- 
a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/MRInputHelpers.java
+++ 
b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/MRInputHelpers.java
@@ -709,10 +709,8 @@ public class MRInputHelpers {
 
   private static String getStringProperty(Configuration conf, String 
propertyName) {
     Preconditions.checkNotNull(conf, "Configuration must be provided");
-    String propertyString = conf.get(propertyName);
-    Preconditions.checkNotNull(propertyString,
-        "Property " + propertyName + " not found in provided configuration");
-    return propertyString;
+    Preconditions.checkNotNull(propertyName, "Property name must be provided");
+    return conf.get(propertyName);
   }
 
   private static int getIntProperty(Configuration conf, String propertyName) {