Return-Path: X-Original-To: apmail-hbase-commits-archive@www.apache.org Delivered-To: apmail-hbase-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DDCE610273 for ; Tue, 19 Nov 2013 17:10:59 +0000 (UTC) Received: (qmail 97831 invoked by uid 500); 19 Nov 2013 17:10:59 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 97750 invoked by uid 500); 19 Nov 2013 17:10:57 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 97466 invoked by uid 99); 19 Nov 2013 17:10:56 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 Nov 2013 17:10:56 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 Nov 2013 17:10:54 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 4044223888E7; Tue, 19 Nov 2013 17:10:33 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1543501 - in /hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase: regionserver/HRegionServer.java replication/regionserver/ReplicationSink.java Date: Tue, 19 Nov 2013 17:10:33 -0000 To: commits@hbase.apache.org From: anoopsamjohn@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131119171033.4044223888E7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: anoopsamjohn Date: Tue Nov 19 17:10:32 2013 New Revision: 1543501 URL: http://svn.apache.org/r1543501 Log: HBASE-9995 Not stopping ReplicationSink when using custom implementation for the ReplicationSink Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSink.java Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=1543501&r1=1543500&r2=1543501&view=diff ============================================================================== --- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (original) +++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java Tue Nov 19 17:10:32 2013 @@ -1878,10 +1878,13 @@ public class HRegionServer implements Cl if (this.replicationSourceHandler != null && this.replicationSourceHandler == this.replicationSinkHandler) { this.replicationSourceHandler.stopReplicationService(); - } else if (this.replicationSourceHandler != null) { - this.replicationSourceHandler.stopReplicationService(); - } else if (this.replicationSinkHandler != null) { - this.replicationSinkHandler.stopReplicationService(); + } else { + if (this.replicationSourceHandler != null) { + this.replicationSourceHandler.stopReplicationService(); + } + if (this.replicationSinkHandler != null) { + this.replicationSinkHandler.stopReplicationService(); + } } } Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSink.java URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSink.java?rev=1543501&r1=1543500&r2=1543501&view=diff ============================================================================== --- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSink.java (original) +++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSink.java Tue Nov 19 17:10:32 2013 @@ -217,7 +217,7 @@ public class ReplicationSink { /** * Do the changes and handle the pool * @param tableName table to insert into - * @param rows list of actions + * @param allRows list of actions * @throws IOException */ protected void batch(TableName tableName, Collection> allRows) throws IOException {