HDFS-1878. TestHDFSServerPorts unit test failure - race condition in FSNamesystem.close() causes NullPointerException without serious consequence. Contributed by Matt Foley.

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

CHANGES.txt

@@ -9,6 +9,10 @@ Release 0.20.205.0 - unreleased
 
   BUG FIXES
 
+    HDFS-1878. TestHDFSServerPorts unit test failure - race condition 
+    in FSNamesystem.close() causes NullPointerException without serious
+    consequence. (mattf)
+
     MAPREDUCE-2452. Moves the cancellation of delegation tokens to a separate
     thread. (ddas)
 

src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java

@@ -564,7 +564,6 @@ public class FSNamesystem implements FSConstants, FSNamesystemMBean,
       if (pendingReplications != null) pendingReplications.stop();
       if (hbthread != null) hbthread.interrupt();
       if (replthread != null) replthread.interrupt();
-      if (replmon != null) replmon = null;
       if (dnthread != null) dnthread.interrupt();
       if (smmthread != null) smmthread.interrupt();
       if (dtSecretManager != null) dtSecretManager.stopThreads();