svn commit: r937590 - /hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java

[stack]

Author: stack
Date: Sat Apr 24 04:27:04 2010
New Revision: 937590

URL: http://svn.apache.org/viewvc?rev=937590&view=rev
Log:
HBASE-2447 LogSyncer.addToSyncQueue doesn't check if syncer is still running 
before waiting -- undo mistaken commit of unrelated stuff

Modified:
    
hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java

Modified: 
hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
URL: 
http://svn.apache.org/viewvc/hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java?rev=937590&r1=937589&r2=937590&view=diff
==============================================================================
--- 
hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
 (original)
+++ 
hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
 Sat Apr 24 04:27:04 2010
@@ -1866,14 +1866,8 @@ public class HRegion implements HConstan
       }
       results.clear();
       boolean returnResult = nextInternal(limit);
-      if (!returnResult && filter != null) {
-        // final chance to modify row contents
-       returnResult = filter.filterRow(results);
-       // final chance to drop the row... This may be superfluous with the 
addition of the above?
-       // still needed for backwards compatibility however
-       if (returnResult || filter.filterRow()) {
-         results.clear();
-       }
+      if (!returnResult && filter != null && filter.filterRow()) {
+        results.clear();
       }
       outResults.addAll(results);
       resetFilters();