Merge -r 1333223:1333224 from trunk to branch. FIXES: HADOOP-8342

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1333225 13f79535-47bb-0310-9956-ffa450edef68

hadoop-common-project/hadoop-common/CHANGES.txt

@@ -272,6 +272,9 @@ Release 2.0.0 - UNRELEASED
     HADOOP-8275. Range check DelegationKey length.
     (Colin Patrick McCabe via eli)
 
+    HADOOP-8342. HDFS command fails with exception following merge of 
+    HADOOP-8325 (tucu)
+
   BREAKDOWN OF HADOOP-7454 SUBTASKS
 
     HADOOP-7455. HA: Introduce HA Service Protocol Interface. (suresh)

hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java

@@ -2198,10 +2198,7 @@ public abstract class FileSystem extends Configured implements Closeable {
       if (map.containsKey(key) && fs == map.get(key)) {
         map.remove(key);
         toAutoClose.remove(key);
-        if (map.isEmpty()) {
-          ShutdownHookManager.get().removeShutdownHook(clientFinalizer);
         }
-      }
     }
 
     synchronized void closeAll() throws IOException {