hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From raw...@apache.org
Subject svn commit: r1070032 - in /hbase/branches/0.90: CHANGES.txt src/main/java/org/apache/hadoop/hbase/regionserver/Store.java
Date Sat, 12 Feb 2011 05:49:40 GMT
Author: rawson
Date: Sat Feb 12 05:49:39 2011
New Revision: 1070032

URL: http://svn.apache.org/viewvc?rev=1070032&view=rev
Log:
HBASE-3524  NPE from CompactionChecker

Modified:
    hbase/branches/0.90/CHANGES.txt
    hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java

Modified: hbase/branches/0.90/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/CHANGES.txt?rev=1070032&r1=1070031&r2=1070032&view=diff
==============================================================================
--- hbase/branches/0.90/CHANGES.txt (original)
+++ hbase/branches/0.90/CHANGES.txt Sat Feb 12 05:49:39 2011
@@ -32,6 +32,7 @@ Release 0.90.1 - February 9th, 2011
    HBASE-3515  [replication] ReplicationSource can miss a log after RS comes
                out of GC
    HBASE-3517  Store build version in hbase-default.xml and verify at runtime
+   HBASE-3524  NPE from CompactionChecker
 
 
   IMPROVEMENTS

Modified: hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java?rev=1070032&r1=1070031&r2=1070032&view=diff
==============================================================================
--- hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java (original)
+++ hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java Sat
Feb 12 05:49:39 2011
@@ -829,7 +829,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()) {



Mime
View raw message