svn commit: r208669 - /lucene/nutch/branches/mapred/src/java/org/apache/nutch/mapred/JobTracker.java

[mc]

Author: mc
Date: Thu Jun 30 12:44:42 2005
New Revision: 208669

URL: http://svn.apache.org/viewcvs?rev=208669&view=rev
Log:

  Slightly different task-status report


Modified:
    
lucene/nutch/branches/mapred/src/java/org/apache/nutch/mapred/JobTracker.java

Modified: 
lucene/nutch/branches/mapred/src/java/org/apache/nutch/mapred/JobTracker.java
URL: 
http://svn.apache.org/viewcvs/lucene/nutch/branches/mapred/src/java/org/apache/nutch/mapred/JobTracker.java?rev=208669&r1=208668&r2=208669&view=diff
==============================================================================
--- 
lucene/nutch/branches/mapred/src/java/org/apache/nutch/mapred/JobTracker.java 
(original)
+++ 
lucene/nutch/branches/mapred/src/java/org/apache/nutch/mapred/JobTracker.java 
Thu Jun 30 12:44:42 2005
@@ -483,11 +483,11 @@
         }
     }
 
-    Vector generateSingleReport(String taskid, TaskStatus status, String 
diagInfo) {
+    Vector generateSingleReport(String taskid, TaskStatus status, Vector 
diagInfo) {
         Vector report = new Vector();
         report.add(taskid);
         report.add("" + status.getProgress());
-        report.add(diagInfo);
+        report.addAll(diagInfo);
         return report;
     }
 
@@ -800,12 +800,12 @@
             }
             return t;
         }
-        public String getTaskDiagnosticInfo(String taskid) {
-            StringBuffer buf = (StringBuffer) taskDiagnosticData.get(taskid);
-            if (buf == null) {
-                return "";
+        public Vector getTaskDiagnosticInfo(String taskid) {
+            Vector v = (Vector) taskDiagnosticData.get(taskid);
+            if (v == null) {
+                return new Vector();
             } else {
-                return buf.toString().trim();
+                return v;
             }
         }
         public float completedRatio() {
@@ -846,12 +846,12 @@
 
             String diagInfo = status.getDiagnosticInfo();
             if (diagInfo != null && diagInfo.length() > 0) {
-                StringBuffer buf = (StringBuffer) 
taskDiagnosticData.get(taskid);
-                if (buf == null) {
-                    buf = new StringBuffer();
-                    taskDiagnosticData.put(taskid, buf);
+                Vector v = (Vector) taskDiagnosticData.get(taskid);
+                if (v == null) {
+                    v = new Vector();
+                    taskDiagnosticData.put(taskid, v);
                 }
-                buf.append(diagInfo);
+                v.add(diagInfo);
             }
 
             if (incompleteMapTasks.get(taskid) != null ||