From a5a2abbacc3af58e5c0216fadd5e0949987e220f Mon Sep 17 00:00:00 2001 From: Alejandro Abdelnur Date: Wed, 2 May 2012 21:48:39 +0000 Subject: [PATCH] HADOOP-8342. HDFS command fails with exception following merge of HADOOP-8325 (tucu) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1333224 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../src/main/java/org/apache/hadoop/fs/FileSystem.java | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index cd1d10396e2..521e9468f8b 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -401,6 +401,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) diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java index 6cd44640fbf..9229b84e8ff 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java +++ b/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 {