From 91e2e10d870a46bb019e3853284f1f9e26f2b56e Mon Sep 17 00:00:00 2001
From: gbellato <gbellato@localhost>
Date: Tue, 15 Jan 2008 13:56:43 +0000
Subject: [PATCH] Fix for issue 2823 : Replication Heartbeat thread dies
---
opendj-sdk/opends/src/server/org/opends/server/replication/plugin/HeartbeatMonitor.java | 4 ++--
opendj-sdk/opends/src/server/org/opends/server/replication/server/ServerHandler.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/HeartbeatMonitor.java b/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/HeartbeatMonitor.java
index 94a2f7d..e0d2d42 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/HeartbeatMonitor.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/HeartbeatMonitor.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Portions Copyright 2007 Sun Microsystems, Inc.
+ * Portions Copyright 2007-2008 Sun Microsystems, Inc.
*/
package org.opends.server.replication.plugin;
@@ -121,12 +121,12 @@
// Heartbeat is well overdue so the server is assumed to be dead.
logError(NOTE_HEARTBEAT_FAILURE.get(currentThread().getName()));
session.close();
+ break;
}
else
{
gotOneFailure = true;
}
- break;
}
else
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/server/ServerHandler.java b/opendj-sdk/opends/src/server/org/opends/server/replication/server/ServerHandler.java
index 3d9c0ec..d624741 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/server/ServerHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/server/ServerHandler.java
@@ -553,7 +553,7 @@
heartbeatThread = new HeartbeatThread(
"replication Heartbeat to " + serverURL +
" for " + this.baseDn,
- session, heartbeatInterval);
+ session, heartbeatInterval/3);
heartbeatThread.start();
}
--
Gitblit v1.10.0