hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From raw...@apache.org
Subject svn commit: r961537 - in /hbase/branches/0.20: CHANGES.txt src/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java src/test/org/apache/hadoop/hbase/regionserver/TestStoreScanner.java
Date Wed, 07 Jul 2010 23:40:59 GMT
Author: rawson
Date: Wed Jul  7 23:40:59 2010
New Revision: 961537

URL: http://svn.apache.org/viewvc?rev=961537&view=rev
Log:
HBASE-2797  Another NPE in ReadWriteConsistencyControl


Modified:
    hbase/branches/0.20/CHANGES.txt
    hbase/branches/0.20/src/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java
    hbase/branches/0.20/src/test/org/apache/hadoop/hbase/regionserver/TestStoreScanner.java

Modified: hbase/branches/0.20/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/branches/0.20/CHANGES.txt?rev=961537&r1=961536&r2=961537&view=diff
==============================================================================
--- hbase/branches/0.20/CHANGES.txt (original)
+++ hbase/branches/0.20/CHANGES.txt Wed Jul  7 23:40:59 2010
@@ -4,6 +4,7 @@ Release 0.20.6 - Unreleased
    HBASE-2763  Cross-port HADOOP-6833 IPC parameter leak bug
    HBASE-2772  Scan doesn't recover from region server failure
    HBASE-2786  TestHLog.testSplit hangs
+   HBASE-2797  Another NPE in ReadWriteConsistencyControl
 
 Release 0.20.5 - Unreleased
 

Modified: hbase/branches/0.20/src/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java?rev=961537&r1=961536&r2=961537&view=diff
==============================================================================
--- hbase/branches/0.20/src/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java (original)
+++ hbase/branches/0.20/src/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java Wed
Jul  7 23:40:59 2010
@@ -140,9 +140,9 @@ class StoreScanner implements KeyValueSc
   }
 
   public synchronized KeyValue peek() {
-    checkReseek();
+    // return the last heap instead of reseeking (so we can close).
     if (this.heap == null) {
-      return null;
+      return this.lastTop;
     }
 
     return this.heap.peek();

Modified: hbase/branches/0.20/src/test/org/apache/hadoop/hbase/regionserver/TestStoreScanner.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.20/src/test/org/apache/hadoop/hbase/regionserver/TestStoreScanner.java?rev=961537&r1=961536&r2=961537&view=diff
==============================================================================
--- hbase/branches/0.20/src/test/org/apache/hadoop/hbase/regionserver/TestStoreScanner.java
(original)
+++ hbase/branches/0.20/src/test/org/apache/hadoop/hbase/regionserver/TestStoreScanner.java
Wed Jul  7 23:40:59 2010
@@ -467,5 +467,7 @@ public class TestStoreScanner extends Te
     scan.updateReaders();
 
     scan.updateReaders();
+
+    scan.peek();
   }
 }



Mime
View raw message