Author: rawson
Date: Sat Feb 12 05:52:58 2011
New Revision: 1070033
URL: http://svn.apache.org/viewvc?rev=1070033&view=rev
Log:
HBASE-3524 NPE from CompactionChecker
Modified:
hbase/trunk/CHANGES.txt
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java
Modified: hbase/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1070033&r1=1070032&r2=1070033&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Sat Feb 12 05:52:58 2011
@@ -108,6 +108,7 @@ Release 0.90.1 - Unreleased
BUG FIXES
HBASE-3483 Memstore lower limit should trigger asynchronous flushes
+ HBASE-3524 NPE from CompactionChecker
IMPROVEMENTS
HBASE-3508 LruBlockCache statistics thread should have a name
Modified:
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java?rev=1070033&r1=1070032&r2=1070033&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java
(original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java
Sat Feb 12 05:52:58 2011
@@ -788,7 +788,10 @@ public class Store implements HeapSize {
if (filesToCompact.size() == 1) {
// Single file
StoreFile sf = filesToCompact.get(0);
- long oldest = now - sf.getReader().timeRangeTracker.minimumTimestamp;
+ long oldest =
+ (sf.getReader().timeRangeTracker == null) ?
+ Long.MIN_VALUE :
+ now - sf.getReader().timeRangeTracker.minimumTimestamp;
if (sf.isMajorCompaction() &&
(this.ttl == HConstants.FOREVER || oldest < this.ttl)) {
if (LOG.isDebugEnabled()) {
