svn commit: r1522025 - in /avro/trunk: CHANGES.txt lang/java/mapred/src/main/java/org/apache/avro/mapred/tether/TetheredProcess.java

[cutting]

Author: cutting
Date: Wed Sep 11 20:26:37 2013
New Revision: 1522025

URL: http://svn.apache.org/r1522025
Log:
AVRO-1374. Java: Fix compilation against Hadoop 2.1.  Contributed by Julian 
Zhou.

Modified:
    avro/trunk/CHANGES.txt
    
avro/trunk/lang/java/mapred/src/main/java/org/apache/avro/mapred/tether/TetheredProcess.java

Modified: avro/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/avro/trunk/CHANGES.txt?rev=1522025&r1=1522024&r2=1522025&view=diff
==============================================================================
--- avro/trunk/CHANGES.txt (original)
+++ avro/trunk/CHANGES.txt Wed Sep 11 20:26:37 2013
@@ -17,6 +17,9 @@ Trunk (not yet released)
     schema, not silently convert any object to a string.
     (Christophe Taton via cutting)
 
+    AVRO-1374. Java: Fix compilation against Hadoop 2.1.
+    (Julian Zhou via cutting)
+
 Avro 1.7.5 (12 August 2013)
 
   NEW FEATURES

Modified: 
avro/trunk/lang/java/mapred/src/main/java/org/apache/avro/mapred/tether/TetheredProcess.java
URL: 
http://svn.apache.org/viewvc/avro/trunk/lang/java/mapred/src/main/java/org/apache/avro/mapred/tether/TetheredProcess.java?rev=1522025&r1=1522024&r2=1522025&view=diff
==============================================================================
--- 
avro/trunk/lang/java/mapred/src/main/java/org/apache/avro/mapred/tether/TetheredProcess.java
 (original)
+++ 
avro/trunk/lang/java/mapred/src/main/java/org/apache/avro/mapred/tether/TetheredProcess.java
 Wed Sep 11 20:26:37 2013
@@ -154,7 +154,7 @@ class TetheredProcess  {
     File stdout = TaskLog.getTaskLogFile(taskid, false, 
TaskLog.LogName.STDOUT);
     File stderr = TaskLog.getTaskLogFile(taskid, false, 
TaskLog.LogName.STDERR);
     long logLength = TaskLog.getTaskLogLength(job);
-    command = TaskLog.captureOutAndError(command, stdout, stderr, logLength);
+    command = TaskLog.captureOutAndError(null, command, stdout, stderr, 
logLength, false);
     stdout.getParentFile().mkdirs();
     stderr.getParentFile().mkdirs();