From 066c81c88d2b17082e559fc8ce90df4097359bb5 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 21 Aug 2013 08:33:59 +0000
Subject: [PATCH] Increased encapsulation in ReplicationServerDomain by: - Making private the start*() methods - Moved some code to here from some other classes - MAking private the buildAndSendTopoInfoTo*() methods.
---
opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationServer.java | 40 +++++++++++++++++++++-------------------
1 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationServer.java b/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationServer.java
index 9a136b5..01afb43 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationServer.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationServer.java
@@ -336,21 +336,21 @@
if (msg instanceof ServerStartMsg)
{
- DataServerHandler handler = new DataServerHandler(
+ DataServerHandler dsHandler = new DataServerHandler(
session, queueSize, this, rcvWindow);
- handler.startFromRemoteDS((ServerStartMsg)msg);
+ dsHandler.startFromRemoteDS((ServerStartMsg) msg);
}
else if (msg instanceof ReplServerStartMsg)
{
- ReplicationServerHandler handler = new ReplicationServerHandler(
+ ReplicationServerHandler rsHandler = new ReplicationServerHandler(
session, queueSize, this, rcvWindow);
- handler.startFromRemoteRS((ReplServerStartMsg)msg);
+ rsHandler.startFromRemoteRS((ReplServerStartMsg) msg);
}
else if (msg instanceof ServerStartECLMsg)
{
- ECLServerHandler handler = new ECLServerHandler(
+ ECLServerHandler eclHandler = new ECLServerHandler(
session, queueSize, this, rcvWindow);
- handler.startFromRemoteServer((ServerStartECLMsg)msg);
+ eclHandler.startFromRemoteServer((ServerStartECLMsg) msg);
}
else
{
@@ -471,9 +471,9 @@
private Set<String> getConnectedRSUrls(ReplicationServerDomain domain)
{
Set<String> results = new LinkedHashSet<String>();
- for (ReplicationServerHandler handler : domain.getConnectedRSs().values())
+ for (ReplicationServerHandler rsHandler : domain.getConnectedRSs().values())
{
- results.add(normalizeServerURL(handler.getServerAddressURL()));
+ results.add(normalizeServerURL(rsHandler.getServerAddressURL()));
}
return results;
}
@@ -507,9 +507,9 @@
socket.connect(ServerAddr, timeoutMS);
session = replSessionSecurity.createClientSession(socket, timeoutMS);
- ReplicationServerHandler handler = new ReplicationServerHandler(
+ ReplicationServerHandler rsHandler = new ReplicationServerHandler(
session, queueSize, this, rcvWindow);
- handler.connect(baseDn, sslEncryption);
+ rsHandler.connect(baseDn, sslEncryption);
}
catch (Exception e)
{
@@ -867,19 +867,22 @@
/**
- * Creates a new DB handler for this ReplicationServer and the serverId and
- * DN given in parameter.
+ * Creates a new DB handler for this ReplicationServer and the serverId and DN
+ * given in parameter.
*
- * @param id The serverId for which the dbHandler must be created.
- * @param baseDn The DN for which the dbHandler must be created.
+ * @param serverId
+ * The serverId for which the dbHandler must be created.
+ * @param baseDn
+ * The DN for which the dbHandler must be created.
* @return The new DB handler for this ReplicationServer and the serverId and
* DN given in parameter.
- * @throws ChangelogException in case of underlying database problem.
+ * @throws ChangelogException
+ * in case of underlying database problem.
*/
- public DbHandler newDbHandler(int id, String baseDn)
+ public DbHandler newDbHandler(int serverId, String baseDn)
throws ChangelogException
{
- return new DbHandler(id, baseDn, this, dbEnv, queueSize);
+ return new DbHandler(serverId, baseDn, this, dbEnv, queueSize);
}
@@ -1139,8 +1142,7 @@
{
for (ReplicationServerDomain domain : getReplicationServerDomains())
{
- domain.buildAndSendTopoInfoToDSs(null);
- domain.buildAndSendTopoInfoToRSs();
+ domain.sendTopoInfoToAll();
}
}
--
Gitblit v1.10.0