Merge from trunk onto 0.18 branch. Fixes HADOOP-3947.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/branches/branch-0.18@685877 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -790,6 +790,9 @@ Release 0.18.0 - 2008-08-06
     HADOOP-3901. Fix bin/hadoop to correctly set classpath under cygwin.
     (Tsz Wo (Nicholas) Sze via omalley)
 
+    HADOOP-3947. Fix a problem in tasktracker reinitialization. 
+    (Amareshwari Sriramadasu via ddas)
+
 Release 0.17.2 - 2008-08-11
 
   BUG FIXES

src/mapred/org/apache/hadoop/mapred/TaskTracker.java

@@ -456,6 +456,7 @@ public class TaskTracker
                              "Map-events fetcher for all reduce tasks " + "on " + 
                              taskTrackerName);
     mapEventsFetcher.start();
+    this.running = true;
   }
   
   /** 
@@ -1332,7 +1333,6 @@ public class TaskTracker
   public void run() {
     try {
       startCleanupThreads();
-      this.running = true;
       boolean denied = false;
       while (running && !shuttingDown && !denied) {
         boolean staleState = false;