Return-Path: Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: (qmail 72809 invoked from network); 21 Jan 2008 12:14:36 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 21 Jan 2008 12:14:36 -0000 Received: (qmail 18730 invoked by uid 500); 21 Jan 2008 12:14:26 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 18646 invoked by uid 500); 21 Jan 2008 12:14:25 -0000 Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "Derby Development" List-Id: Delivered-To: mailing list derby-commits@db.apache.org Received: (qmail 18635 invoked by uid 99); 21 Jan 2008 12:14:25 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 21 Jan 2008 04:14:25 -0800 X-ASF-Spam-Status: No, hits=-98.8 required=10.0 tests=ALL_TRUSTED,FS_REPLICA X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 21 Jan 2008 12:14:08 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id CD2D51A9832; Mon, 21 Jan 2008 04:14:14 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r613866 - /db/derby/code/trunk/java/engine/org/apache/derby/impl/services/replication/master/MasterController.java Date: Mon, 21 Jan 2008 12:14:14 -0000 To: derby-commits@db.apache.org From: oysteing@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080121121414.CD2D51A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: oysteing Date: Mon Jan 21 04:14:12 2008 New Revision: 613866 URL: http://svn.apache.org/viewvc?rev=613866&view=rev Log: DERBY-3235: Stop LogShipper when Master is stopped. Contributed by V Narayanan Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/replication/master/MasterController.java Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/replication/master/MasterController.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/replication/master/MasterController.java?rev=613866&r1=613865&r2=613866&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/replication/master/MasterController.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/replication/master/MasterController.java Mon Jan 21 04:14:12 2008 @@ -211,6 +211,8 @@ logFactory.stopReplicationMasterRole(); try { logShipper.flushBuffer(); + + logShipper.stopLogShipment(); ReplicationMessage mesg = new ReplicationMessage( ReplicationMessage.TYPE_STOP, null);