svn commit: r1326009 - in /hadoop/common/branches/HDFS-3092: ./ hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Task20LineHistoryEventEmitter.java

[szetszwo]

Author: szetszwo
Date: Fri Apr 13 23:24:24 2012
New Revision: 1326009

URL: http://svn.apache.org/viewvc?rev=1326009&view=rev
Log:
Merge r1325570 through r1326008 from trunk.

Modified:
    hadoop/common/branches/HDFS-3092/   (props changed)
    
hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Task20LineHistoryEventEmitter.java

Propchange: hadoop/common/branches/HDFS-3092/
------------------------------------------------------------------------------
  Merged /hadoop/common/trunk:r1325570-1326008

Modified: 
hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Task20LineHistoryEventEmitter.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Task20LineHistoryEventEmitter.java?rev=1326009&r1=1326008&r2=1326009&view=diff
==============================================================================
--- 
hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Task20LineHistoryEventEmitter.java
 (original)
+++ 
hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Task20LineHistoryEventEmitter.java
 Fri Apr 13 23:24:24 2012
@@ -128,7 +128,7 @@ public class Task20LineHistoryEventEmitt
           return null;
         }
 
-        return new TaskFinishedEvent(taskID, Long.parseLong(finishTime),
+        return new TaskFinishedEvent(taskID, null, Long.parseLong(finishTime),
             that.originalTaskType, status, eventCounters);
       }