hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From szets...@apache.org
Subject svn commit: r1407270 - in /hadoop/common/branches/branch-1: CHANGES.txt src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
Date Thu, 08 Nov 2012 21:27:39 GMT
Author: szetszwo
Date: Thu Nov  8 21:27:39 2012
New Revision: 1407270

URL: http://svn.apache.org/viewvc?rev=1407270&view=rev
Log:
HDFS-4168. Fix a NullPointerException in FSNamesystem.removeBlocks(..).  Jing Zhao

Modified:
    hadoop/common/branches/branch-1/CHANGES.txt
    hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java

Modified: hadoop/common/branches/branch-1/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1407270&r1=1407269&r2=1407270&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Thu Nov  8 21:27:39 2012
@@ -310,6 +310,9 @@ Release 1.2.0 - unreleased
     MAPREDUCE-4765. Restarting the JobTracker programmatically can cause
     DelegationTokenRenewal to throw an exception. (rkanter via tucu)
 
+    HDFS-4168. Fix a NullPointerException in FSNamesystem.removeBlocks(..).
+    (Jing Zhao via szetszwo)
+
 Release 1.1.1 - Unreleased
 
   INCOMPATIBLE CHANGES

Modified: hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java?rev=1407270&r1=1407269&r2=1407270&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
(original)
+++ hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
Thu Nov  8 21:27:39 2012
@@ -2209,7 +2209,9 @@ public class FSNamesystem implements FSC
           blocksMap.removeINode(b);
           corruptReplicas.removeFromCorruptReplicasMap(b);
           // Remove the block from pendingReplications
-          pendingReplications.remove(b);
+          if (pendingReplications != null) {
+            pendingReplications.remove(b);
+          }
           addToInvalidates(b);
         }
       }



Mime
View raw message