From 46fd9423ab622d7f9531aa1564846ec52fe09534 Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Wed, 24 Apr 2013 12:44:51 +0000
Subject: [PATCH] Replication Cleanup.
---
opends/src/server/org/opends/server/replication/server/ECLServerWriter.java | 16 +++++-----------
1 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/server/ECLServerWriter.java b/opends/src/server/org/opends/server/replication/server/ECLServerWriter.java
index 9f87191..5388c55 100644
--- a/opends/src/server/org/opends/server/replication/server/ECLServerWriter.java
+++ b/opends/src/server/org/opends/server/replication/server/ECLServerWriter.java
@@ -23,7 +23,7 @@
*
*
* Copyright 2009 Sun Microsystems, Inc.
- * Portions copyright 2011-2012 ForgeRock AS
+ * Portions copyright 2011-2013 ForgeRock AS
*/
package org.opends.server.replication.server;
import static org.opends.messages.ReplicationMessages.*;
@@ -145,7 +145,7 @@
{
while (true)
{
- // wait to be resumed or shutdowned
+ // wait to be resumed or shutdown
if ((suspended) && (!shutdown))
{
synchronized(this)
@@ -224,12 +224,7 @@
ECLUpdateMsg update = null;
while (true)
{
- if (shutdown)
- {
- return;
- }
-
- if (suspended)
+ if (shutdown || suspended)
{
return;
}
@@ -267,14 +262,13 @@
{
// except if we are in persistent search
Thread.sleep(200);
- continue;
}
}
else
{
// Publish the update to the remote server using a protocol version he
// it supports
- publish(update, protocolVersion);
+ publish(update);
update = null;
}
}
@@ -292,7 +286,7 @@
/**
* Publish a change either on the protocol session or to a persistent search.
*/
- private void publish(ECLUpdateMsg msg, short reqProtocolVersion)
+ private void publish(ECLUpdateMsg msg)
throws IOException
{
if (debugEnabled())
--
Gitblit v1.10.0