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 su...@apache.org on 2011/09/26 22:39:11 UTC
svn commit: r1176042 - in /hadoop/common/branches/branch-0.20-security-205:
CHANGES.txt
src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataBlockScanner.java
Author: suresh
Date: Mon Sep 26 20:39:10 2011
New Revision: 1176042
URL: http://svn.apache.org/viewvc?rev=1176042&view=rev
Log:
HDFS-2359. Fix NullPointerException in DataBlockScanner. Contributed by Jonthan Eagles.
Modified:
hadoop/common/branches/branch-0.20-security-205/CHANGES.txt
hadoop/common/branches/branch-0.20-security-205/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataBlockScanner.java
Modified: hadoop/common/branches/branch-0.20-security-205/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-205/CHANGES.txt?rev=1176042&r1=1176041&r2=1176042&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-205/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20-security-205/CHANGES.txt Mon Sep 26 20:39:10 2011
@@ -211,6 +211,9 @@ Release 0.20.205.0 - 2011.09.12
HADOOP-7676. Enable hbase to run as hdfs user (gkesavan)
+ HDFS-2359. Fix NullPointerException in DataBlockScanner.
+ (Jonthan Eagles via suresh)
+
IMPROVEMENTS
MAPREDUCE-2928. MR-2413 improvements (Eli Collins via mattf)
Modified: hadoop/common/branches/branch-0.20-security-205/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataBlockScanner.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-205/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataBlockScanner.java?rev=1176042&r1=1176041&r2=1176042&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-205/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataBlockScanner.java (original)
+++ hadoop/common/branches/branch-0.20-security-205/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataBlockScanner.java Mon Sep 26 20:39:10 2011
@@ -785,6 +785,9 @@ class DataBlockScanner implements Runnab
* return true if append was successful.
*/
synchronized boolean appendLine(String line) {
+ if (out == null) {
+ return false;
+ }
out.println();
out.print(line);
curNumLines += (curNumLines < 0) ? -1 : 1;