You are viewing a plain text version of this content. The canonical link for it is here.
Posted to hdfs-commits@hadoop.apache.org by sz...@apache.org on 2011/03/31 00:33:08 UTC
svn commit: r1087115 - in /hadoop/hdfs/trunk: CHANGES.txt
src/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
Author: szetszwo
Date: Wed Mar 30 22:33:07 2011
New Revision: 1087115
URL: http://svn.apache.org/viewvc?rev=1087115&view=rev
Log:
HDFS-1782. Fix an NPE in RFSNamesystem.startFileInternal(..). Contributed by John George
Modified:
hadoop/hdfs/trunk/CHANGES.txt
hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
Modified: hadoop/hdfs/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/CHANGES.txt?rev=1087115&r1=1087114&r2=1087115&view=diff
==============================================================================
--- hadoop/hdfs/trunk/CHANGES.txt (original)
+++ hadoop/hdfs/trunk/CHANGES.txt Wed Mar 30 22:33:07 2011
@@ -601,6 +601,9 @@ Release 0.22.0 - Unreleased
HDFS-1781. Fix the path for jsvc in bin/hdfs. (John George via szetszwo)
+ HDFS-1782. Fix an NPE in RFSNamesystem.startFileInternal(..).
+ (John George via szetszwo)
+
Release 0.21.1 - Unreleased
IMPROVEMENTS
Modified: hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java?rev=1087115&r1=1087114&r2=1087115&view=diff
==============================================================================
--- hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java (original)
+++ hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java Wed Mar 30 22:33:07 2011
@@ -1394,7 +1394,8 @@ public class FSNamesystem implements FSC
". Lease recovery is in progress. Try again later.");
} else {
- if(pendingFile.getLastBlock().getBlockUCState() ==
+ BlockInfoUnderConstruction lastBlock=pendingFile.getLastBlock();
+ if(lastBlock != null && lastBlock.getBlockUCState() ==
BlockUCState.UNDER_RECOVERY) {
throw new RecoveryInProgressException(
"Recovery in progress, file [" + src + "], " +