Return-Path: Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: (qmail 65922 invoked from network); 3 Mar 2008 11:45:24 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 3 Mar 2008 11:45:24 -0000 Received: (qmail 64595 invoked by uid 500); 3 Mar 2008 11:45:19 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 64575 invoked by uid 500); 3 Mar 2008 11:45:19 -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 64564 invoked by uid 99); 3 Mar 2008 11:45:19 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Mar 2008 03:45:19 -0800 X-ASF-Spam-Status: No, hits=-1998.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, 03 Mar 2008 11:44:52 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 216841A9832; Mon, 3 Mar 2008 03:45:01 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r633045 - /db/derby/code/trunk/java/engine/org/apache/derby/impl/services/replication/master/MasterController.java Date: Mon, 03 Mar 2008 11:44:59 -0000 To: derby-commits@db.apache.org From: oysteing@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080303114502.216841A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: oysteing Date: Mon Mar 3 03:44:52 2008 New Revision: 633045 URL: http://svn.apache.org/viewvc?rev=633045&view=rev Log: DERBY-3364: If the call to flushBuffer in stopMaster fails, teardownNetwork() is not called. 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=633045&r1=633044&r2=633045&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 Mar 3 03:44:52 2008 @@ -222,7 +222,6 @@ logFactory.stopReplicationMasterRole(); try { logShipper.flushBuffer(); - teardownNetwork(); } catch (IOException ioe) { ReplicationLogger. logError(MessageId.REPLICATION_LOGSHIPPER_EXCEPTION, @@ -231,6 +230,8 @@ ReplicationLogger. logError(MessageId.REPLICATION_LOGSHIPPER_EXCEPTION, se, dbname); + } finally { + teardownNetwork(); } Monitor.logTextMessage(MessageId.REPLICATION_MASTER_STOPPED, dbname); }