Prechádzať zdrojové kódy

HADOOP-3599. Fix JobConf::setCombineOnceOnly to modify the instance rather
than a parameter. Contributed by Owen O'Malley.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/trunk@669646 13f79535-47bb-0310-9956-ffa450edef68

Christopher Douglas 17 rokov pred
rodič
commit
c1623e3001

+ 3 - 0
CHANGES.txt

@@ -634,6 +634,9 @@ Release 0.18.0 - Unreleased
     HADOOP-3569. KFS input stream read() now correctly reads 1 byte
     HADOOP-3569. KFS input stream read() now correctly reads 1 byte
     instead of 4. (Sriram Rao via omalley)
     instead of 4. (Sriram Rao via omalley)
 
 
+    HADOOP-3599. Fix JobConf::setCombineOnceOnly to modify the instance rather
+    than a parameter. (Owen O'Malley via cdouglas)
+
 Release 0.17.1 - Unreleased
 Release 0.17.1 - Unreleased
 
 
   INCOMPATIBLE CHANGES
   INCOMPATIBLE CHANGES

+ 2 - 2
src/mapred/org/apache/hadoop/mapred/JobConf.java

@@ -803,8 +803,8 @@ public class JobConf extends Configuration {
    * the map. Otherwise, combiner may be run zero or more times.
    * the map. Otherwise, combiner may be run zero or more times.
    */
    */
   @Deprecated
   @Deprecated
-  public void setCombineOnceOnly(JobConf conf, boolean value) {
-    conf.setBoolean("mapred.combine.once", value);
+  public void setCombineOnceOnly(boolean value) {
+    setBoolean("mapred.combine.once", value);
   }
   }
 
 
   @Deprecated
   @Deprecated