db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From oyste...@apache.org
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 GMT
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);
     }



Mime
View raw message