svn commit: r995281 - in /hbase/trunk: CHANGES.txt src/main/java/org/apache/hadoop/hbase/master/LogCleaner.java

[stack]

Author: stack
Date: Wed Sep  8 23:34:10 2010
New Revision: 995281

URL: http://svn.apache.org/viewvc?rev=995281&view=rev
Log:
HBASE-2973 NPE in LogCleaner

Modified:
    hbase/trunk/CHANGES.txt
    hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/LogCleaner.java

Modified: hbase/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=995281&r1=995280&r2=995281&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Wed Sep  8 23:34:10 2010
@@ -513,6 +513,7 @@ Release 0.21.0 - Unreleased
                written out to SequenceFile
    HBASE-2969  missing sync in HTablePool.getTable()
                (Guilherme Mauro Germoglio Barbosa via Stack)
+   HBASE-2973  NPE in LogCleaner
 
   IMPROVEMENTS
    HBASE-1760  Cleanup TODOs in HTable

Modified: 
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/LogCleaner.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/LogCleaner.java?rev=995281&r1=995280&r2=995281&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/LogCleaner.java 
(original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/LogCleaner.java 
Wed Sep  8 23:34:10 2010
@@ -123,7 +123,8 @@ public class LogCleaner extends Chore {
   @Override
   protected void chore() {
     try {
-      FileStatus[] files = this.fs.listStatus(this.oldLogDir);
+      FileStatus [] files = this.fs.listStatus(this.oldLogDir);
+      if (files == null) return;
       int nbDeletedLog = 0;
       FILE: for (FileStatus file : files) {
         Path filePath = file.getPath();