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/ServerHandler.java |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/opends/src/server/org/opends/server/replication/server/ServerHandler.java b/opends/src/server/org/opends/server/replication/server/ServerHandler.java
index 4820e9a..631d578 100644
--- a/opends/src/server/org/opends/server/replication/server/ServerHandler.java
+++ b/opends/src/server/org/opends/server/replication/server/ServerHandler.java
@@ -23,6 +23,7 @@
  *
  *
  *      Copyright 2006-2010 Sun Microsystems, Inc.
+ *      Portions copyright 2011 ForgeRock AS
  */
 package org.opends.server.replication.server;
 
@@ -375,8 +376,8 @@
       // sendWindow MUST be created before starting the writer
       sendWindow = new Semaphore(sendWindowSize);
 
-      writer = new ServerWriter(session, serverId,
-          this, replicationServerDomain);
+      writer = new ServerWriter(session, this,
+          replicationServerDomain);
       reader = new ServerReader(session, this);
 
       reader.start();
@@ -385,11 +386,12 @@
       // Create a thread to send heartbeat messages.
       if (heartbeatInterval > 0)
       {
-        heartbeatThread = new HeartbeatThread(
-            "Replication Heartbeat to " + this +
-            " in RS " + replicationServerDomain.getReplicationServer().
-            getMonitorInstanceName(),
-            session, heartbeatInterval / 3);
+        String threadName = "Replication server RS("
+            + this.getReplicationServerId()
+            + ") heartbeat publisher to " + this.toString() + " at "
+            + session.getReadableRemoteAddress();
+        heartbeatThread = new HeartbeatThread(threadName, session,
+            heartbeatInterval / 3);
         heartbeatThread.start();
       }
     }

--
Gitblit v1.10.0