svn commit: r734916 - in /hadoop/core/trunk: CHANGES.txt src/mapred/org/apache/hadoop/mapreduce/Job.java

[omalley]

Author: omalley
Date: Thu Jan 15 22:06:56 2009
New Revision: 734916

URL: http://svn.apache.org/viewvc?rev=734916&view=rev
Log:
HADOOP-5065. Remove generic parameters from argument to 
setIn/OutputFormatClass so that it works with SequenceIn/OutputFormat.
(cdouglas via omalley)

Modified:
    hadoop/core/trunk/CHANGES.txt
    hadoop/core/trunk/src/mapred/org/apache/hadoop/mapreduce/Job.java

Modified: hadoop/core/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=734916&r1=734915&r2=734916&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Thu Jan 15 22:06:56 2009
@@ -591,6 +591,10 @@
     HADOOP-4988. Fix reclaim capacity to work even when there are queues with
     no capacity. (Vivek Ratan via yhemanth)
 
+    HADOOP-5065. Remove generic parameters from argument to 
+    setIn/OutputFormatClass so that it works with SequenceIn/OutputFormat.
+    (cdouglas via omalley)
+
 Release 0.19.1 - Unreleased
 
   IMPROVEMENTS

Modified: hadoop/core/trunk/src/mapred/org/apache/hadoop/mapreduce/Job.java
URL: 
http://svn.apache.org/viewvc/hadoop/core/trunk/src/mapred/org/apache/hadoop/mapreduce/Job.java?rev=734916&r1=734915&r2=734916&view=diff
==============================================================================
--- hadoop/core/trunk/src/mapred/org/apache/hadoop/mapreduce/Job.java (original)
+++ hadoop/core/trunk/src/mapred/org/apache/hadoop/mapreduce/Job.java Thu Jan 
15 22:06:56 2009
@@ -88,7 +88,7 @@
    * @param cls the <code>InputFormat</code> to use
    * @throws IllegalStateException if the job is submitted
    */
-  public void setInputFormatClass(Class<? extends InputFormat<?,?>> cls
+  public void setInputFormatClass(Class<? extends InputFormat> cls
                                   ) throws IllegalStateException {
     ensureState(JobState.DEFINE);
     conf.setClass(INPUT_FORMAT_CLASS_ATTR, cls, InputFormat.class);
@@ -99,7 +99,7 @@
    * @param cls the <code>OutputFormat</code> to use
    * @throws IllegalStateException if the job is submitted
    */
-  public void setOutputFormatClass(Class<? extends OutputFormat<?,?>> cls
+  public void setOutputFormatClass(Class<? extends OutputFormat> cls
                                    ) throws IllegalStateException {
     ensureState(JobState.DEFINE);
     conf.setClass(OUTPUT_FORMAT_CLASS_ATTR, cls, OutputFormat.class);