From 172f9ff26c2a07363b37ea83bdaba4ac6ef70226 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Fri, 18 Mar 2011 21:00:33 +0000
Subject: [PATCH] Fix issue opendj-92: improve replication thread names

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

diff --git a/opends/src/server/org/opends/server/replication/server/ReplicationServer.java b/opends/src/server/org/opends/server/replication/server/ReplicationServer.java
index ad4db5e..5e73527 100644
--- a/opends/src/server/org/opends/server/replication/server/ReplicationServer.java
+++ b/opends/src/server/org/opends/server/replication/server/ReplicationServer.java
@@ -135,7 +135,7 @@
           new ConcurrentHashMap<String, ReplicationServerDomain>();
 
   private String localURL = "null";
-  private boolean shutdown = false;
+  private volatile boolean shutdown = false;
   private ReplicationDbEnv dbEnv;
   private int rcvWindow;
   private int queueSize;
@@ -336,11 +336,10 @@
       // Read incoming messages and create LDAP or ReplicationServer listener
       // and Publisher.
 
-      ProtocolSession session;
-      Socket newSocket = null;
-
       try
       {
+        ProtocolSession session;
+        Socket newSocket = null;
         try
         {
           newSocket = listenSocket.accept();
@@ -586,18 +585,14 @@
       if (debugEnabled())
         TRACER.debugInfo("RS " +getMonitorInstanceName()+
             " creates connect thread");
-      connectThread =
-        new ReplicationServerConnectThread("Replication Server Connect " +
-        serverId , this);
+      connectThread = new ReplicationServerConnectThread(this);
       connectThread.start();
 
       if (debugEnabled())
         TRACER.debugInfo("RS " +getMonitorInstanceName()+
             " creates listen thread");
 
-      listenThread =
-        new ReplicationServerListenThread("Replication Server Listener " +
-        serverId , this);
+      listenThread = new ReplicationServerListenThread(this);
       listenThread.start();
 
       // Creates the ECL workflow elem so that DS (LDAPReplicationDomain)
@@ -1027,9 +1022,7 @@
         listenSocket = new ServerSocket();
         listenSocket.bind(new InetSocketAddress(replicationPort));
 
-        listenThread =
-          new ReplicationServerListenThread(
-              "Replication Server Listener", this);
+        listenThread = new ReplicationServerListenThread(this);
         listenThread.start();
       }
       catch (IOException e)

--
Gitblit v1.10.0