You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by om...@apache.org on 2011/03/04 04:31:19 UTC
svn commit: r1077025 -
/hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
Author: omalley
Date: Fri Mar 4 03:31:19 2011
New Revision: 1077025
URL: http://svn.apache.org/viewvc?rev=1077025&view=rev
Log:
commit 6a75da8bf26fa428f8e04cd8ec723187cc462675
Author: Hairong Kuang <ha...@ucdev21.inktomisearch.com>
Date: Mon Oct 19 17:28:54 2009 +0000
HDFS:686 from http://issues.apache.org/jira/secure/attachment/12421668/openNPE.patch
+++ b/YAHOO-CHANGES.txt
+ HDFS-686. NullPointerException is thrown while merging edit log and
+ image. (hairong)
+
Modified:
hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
Modified: hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java?rev=1077025&r1=1077024&r2=1077025&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java Fri Mar 4 03:31:19 2011
@@ -770,7 +770,7 @@ public class FSNamesystem implements FSC
if (length < 0) {
throw new IOException("Negative length is not supported. File: " + src );
}
- final LocatedBlocks ret = getBlockLocationsInternal(src, dir.getFileINode(src),
+ final LocatedBlocks ret = getBlockLocationsInternal(src,
offset, length, Integer.MAX_VALUE, doAccessTime);
if (auditLog.isInfoEnabled()) {
logAuditEvent(UserGroupInformation.getCurrentUGI(),
@@ -781,12 +781,12 @@ public class FSNamesystem implements FSC
}
private synchronized LocatedBlocks getBlockLocationsInternal(String src,
- INodeFile inode,
long offset,
long length,
int nrBlocksToReturn,
boolean doAccessTime)
throws IOException {
+ INodeFile inode = dir.getFileINode(src);
if(inode == null) {
return null;
}