From 17beeae33bb7d73dee3f1a4f9bdf18e5645717d7 Mon Sep 17 00:00:00 2001
From: mrossign <mrossign@localhost>
Date: Wed, 05 Dec 2007 09:31:02 +0000
Subject: [PATCH] Fix for #2655: Renaming ReplicationCache into ReplicationServerDomain
---
opends/src/server/org/opends/server/replication/server/ServerWriter.java | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/server/ServerWriter.java b/opends/src/server/org/opends/server/replication/server/ServerWriter.java
index 18d7e8b..fca9f9f 100644
--- a/opends/src/server/org/opends/server/replication/server/ServerWriter.java
+++ b/opends/src/server/org/opends/server/replication/server/ServerWriter.java
@@ -56,7 +56,7 @@
private ProtocolSession session;
private ServerHandler handler;
- private ReplicationCache replicationCache;
+ private ReplicationServerDomain replicationServerDomain;
private short serverId;
/**
@@ -67,22 +67,24 @@
* @param session the ProtocolSession that will be used to send updates.
* @param serverId the Identifier of the server.
* @param handler handler for which the ServerWriter is created.
- * @param replicationCache The ReplicationCache of this ServerWriter.
+ * @param replicationServerDomain The ReplicationServerDomain of this
+ * ServerWriter.
*/
public ServerWriter(ProtocolSession session, short serverId,
- ServerHandler handler, ReplicationCache replicationCache)
+ ServerHandler handler,
+ ReplicationServerDomain replicationServerDomain)
{
super(handler.toString() + " writer");
this.serverId = serverId;
this.session = session;
this.handler = handler;
- this.replicationCache = replicationCache;
+ this.replicationServerDomain = replicationServerDomain;
}
/**
* Run method for the ServerWriter.
- * Loops waiting for changes from the ReplicationCache and forward them
+ * Loops waiting for changes from the ReplicationServerDomain and forward them
* to the other servers
*/
public void run()
@@ -102,12 +104,12 @@
{
while (true)
{
- UpdateMessage update = replicationCache.take(this.handler);
+ UpdateMessage update = replicationServerDomain.take(this.handler);
if (update == null)
return; /* this connection is closing */
// Ignore update to be sent to a replica with a bad generation ID
- long referenceGenerationId = replicationCache.getGenerationId();
+ long referenceGenerationId = replicationServerDomain.getGenerationId();
if ((referenceGenerationId != handler.getGenerationId())
|| (referenceGenerationId == -1)
|| (handler.getGenerationId() == -1))
@@ -121,7 +123,7 @@
if (debugEnabled())
{
TRACER.debugInfo(
- "In " + replicationCache.getReplicationServer().
+ "In " + replicationServerDomain.getReplicationServer().
getMonitorInstanceName() +
", writer to " + this.handler.getMonitorInstanceName() +
" publishes msg=" + update.toString() +
@@ -168,7 +170,7 @@
{
// Can't do much more : ignore
}
- replicationCache.stopServer(handler);
+ replicationServerDomain.stopServer(handler);
if (debugEnabled())
{
--
Gitblit v1.10.0