svn commit: r934688 - in /hadoop/hbase/branches/0.20_pre_durability: CHANGES.txt src/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java

[stack]

Author: stack
Date: Fri Apr 16 05:17:30 2010
New Revision: 934688

URL: http://svn.apache.org/viewvc?rev=934688&view=rev
Log:
HBASE-2456 deleteChangedReaderObserver spitting warnings after HBASE-2248

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

Modified: hadoop/hbase/branches/0.20_pre_durability/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/hbase/branches/0.20_pre_durability/CHANGES.txt?rev=934688&r1=934687&r2=934688&view=diff
==============================================================================
--- hadoop/hbase/branches/0.20_pre_durability/CHANGES.txt (original)
+++ hadoop/hbase/branches/0.20_pre_durability/CHANGES.txt Fri Apr 16 05:17:30 
2010
@@ -49,6 +49,7 @@ Release 0.20.4 - Thu Apr 15 16:29:44 PDT
    HBASE-2451  .META. by-passes cache; BLOCKCACHE=>'false'
    HBASE-2453  Revisit compaction policies after HBASE-2248 commit
                (Jonathan Gray via Stack)
+   HBASE-2456  deleteChangedReaderObserver spitting warnings after HBASE-2248 
 
   IMPROVEMENTS
    HBASE-2180  Bad read performance from synchronizing hfile.fddatainputstream

Modified: 
hadoop/hbase/branches/0.20_pre_durability/src/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java
URL: 
http://svn.apache.org/viewvc/hadoop/hbase/branches/0.20_pre_durability/src/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java?rev=934688&r1=934687&r2=934688&view=diff
==============================================================================
--- 
hadoop/hbase/branches/0.20_pre_durability/src/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java
 (original)
+++ 
hadoop/hbase/branches/0.20_pre_durability/src/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java
 Fri Apr 16 05:17:30 2010
@@ -146,6 +146,7 @@ class StoreScanner implements KeyValueSc
 
   public synchronized void close() {
     this.closing = true;
+    if (this.closing) return;
     // under test, we dont have a this.store
     if (this.store != null)
       this.store.deleteChangedReaderObserver(this);
@@ -274,4 +275,4 @@ class StoreScanner implements KeyValueSc
     KeyValue kv = heap.peek();
     matcher.setRow((kv == null ? topKey : kv).getRow());
   }
-}
\ No newline at end of file
+}