Merge -r 755225:755226 from trunk onto 0.20 branch. Fixes HADOOP-5483.

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

CHANGES.txt

@@ -739,6 +739,9 @@ Release 0.20.0 - Unreleased
     and that brings down the log messages in the JobClient to do with
     NetworkTopology.add significantly. (Jothi Padmanabhan via ddas)
 
+    HADOOP-5483. Fixes a problem in the Directory Cleanup Thread due to which
+    TestMiniMRWithDFS sometimes used to fail. (ddas) 
+
 Release 0.19.2 - Unreleased
 
   BUG FIXES

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

@@ -91,10 +91,11 @@ class CleanupQueue {
           FileSystem fs = pathAndConf.path.getFileSystem(pathAndConf.conf);
           fs.delete(pathAndConf.path, true);
           LOG.debug("DELETED " + pathAndConf.path);
-        } catch (IOException e) {
-          LOG.warn("Error deleting path" + pathAndConf.path);
         } catch (InterruptedException t) {
-        }
+          return;
+        } catch (Exception e) {
+          LOG.warn("Error deleting path" + pathAndConf.path);
+        } 
       }
     }
   }