From 6b626b5e5d531af2c4f9b7cad401c28fd7db87b0 Mon Sep 17 00:00:00 2001
From: Michael Stack <stack@apache.org>
Date: Sat, 24 Apr 2010 04:27:04 +0000
Subject: [PATCH] HBASE-2447 LogSyncer.addToSyncQueue doesn't check if syncer
 is still running before waiting -- undo mistaken commit of unrelated stuff

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@937590 13f79535-47bb-0310-9956-ffa450edef68
---
 .../org/apache/hadoop/hbase/regionserver/HRegion.java  | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/core/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java b/core/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
index 4c67d839b6c..9f5a315e69a 100644
--- a/core/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
+++ b/core/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
@@ -1866,14 +1866,8 @@ public class HRegion implements HConstants, HeapSize { // , Writable{
       }
       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();