From 296090552c8bb9ad83cfa819fbf0bd9d0ba8fac2 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Mon, 18 Apr 2011 15:55:45 +0000
Subject: [PATCH] Fix OpenDJ-117: IllegalMonitorStateException during server shutdown

---
 opends/src/server/org/opends/server/replication/server/ReplicationServerHandler.java |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)

diff --git a/opends/src/server/org/opends/server/replication/server/ReplicationServerHandler.java b/opends/src/server/org/opends/server/replication/server/ReplicationServerHandler.java
index 3c35331..9b0ac2b 100644
--- a/opends/src/server/org/opends/server/replication/server/ReplicationServerHandler.java
+++ b/opends/src/server/org/opends/server/replication/server/ReplicationServerHandler.java
@@ -178,7 +178,6 @@
 
     try
     {
-      //
       lockDomain(false); // no timeout
 
       // Send start
@@ -260,15 +259,11 @@
       logError(message);
 
       super.finalizeStart();
-
     }
     catch(IOException ioe)
     {
       // FIXME receive
     }
-    // catch(DirectoryException de)
-    //{ already logged
-    //
     catch(Exception e)
     {
       // FIXME more detailed exceptions
@@ -528,7 +523,7 @@
             msg.getClass().getCanonicalName(),
             "TopologyMsg");
       }
-      abortStart(message);
+      throw new DirectoryException(ResultCode.OTHER, message);
     }
 
     // Remote RS sent his topo msg

--
Gitblit v1.10.0