From 10b76e3a58346e0b6e2e07e58617b75dc383c249 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.
---
opends/src/server/org/opends/server/replication/server/ReplicationServerHandler.java | 20 ++------------------
1 files changed, 2 insertions(+), 18 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/server/ReplicationServerHandler.java b/opends/src/server/org/opends/server/replication/server/ReplicationServerHandler.java
index 94334d1..7b4885e 100644
--- a/opends/src/server/org/opends/server/replication/server/ReplicationServerHandler.java
+++ b/opends/src/server/org/opends/server/replication/server/ReplicationServerHandler.java
@@ -230,13 +230,11 @@
logTopoHandshakeSNDandRCV(outTopoMsg, inTopoMsg);
- replicationServerDomain.startMonitoringPublisher();
-
/*
FIXME: i think this should be done for all protocol version !!
not only those > V1
*/
- registerIntoDomain();
+ replicationServerDomain.register(this);
/*
Process TopologyMsg sent by remote RS: store matching new info
@@ -376,9 +374,7 @@
*/
}
- replicationServerDomain.startMonitoringPublisher();
-
- registerIntoDomain();
+ replicationServerDomain.register(this);
// Process TopologyMsg sent by remote RS: store matching new info
// (this will also warn our connected DSs of the new received info)
@@ -429,18 +425,6 @@
}
/**
- * Registers this handler into its related domain and notifies the domain.
- */
- private void registerIntoDomain()
- {
- // Alright, connected with new RS (either outgoing or incoming
- // connection): store handler.
- Map<Integer, ReplicationServerHandler> connectedRSs =
- replicationServerDomain.getConnectedRSs();
- connectedRSs.put(serverId, this);
- }
-
- /**
* Wait receiving the TopologyMsg from the remote RS and process it.
* @return the topologyMsg received or {@code null} if stop was received.
* @throws DirectoryException
--
Gitblit v1.10.0