From 763640e8f9698113b2c001a71a718eecb60ac30c Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 03 Jul 2014 15:19:12 +0000
Subject: [PATCH] OPENDJ-1453 (CR-3938) Replica offline messages should be synced with updates
---
opendj-sdk/opends/src/server/org/opends/server/replication/server/ServerHandler.java | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
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 291dcdb..63718bf 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
@@ -68,7 +68,7 @@
/**
* The session opened with the remote server.
*/
- protected Session session;
+ protected final Session session;
/**
* The serverURL of the remote server.
@@ -77,40 +77,39 @@
/**
* Number of updates received from the server in assured safe read mode.
*/
- protected int assuredSrReceivedUpdates = 0;
+ private int assuredSrReceivedUpdates = 0;
/**
* Number of updates received from the server in assured safe read mode that
* timed out.
*/
- protected AtomicInteger assuredSrReceivedUpdatesTimeout = new AtomicInteger();
+ private final AtomicInteger assuredSrReceivedUpdatesTimeout = new AtomicInteger();
/**
* Number of updates sent to the server in assured safe read mode.
*/
- protected int assuredSrSentUpdates = 0;
+ private int assuredSrSentUpdates = 0;
/**
* Number of updates sent to the server in assured safe read mode that timed
* out.
*/
- protected AtomicInteger assuredSrSentUpdatesTimeout = new AtomicInteger();
+ private final AtomicInteger assuredSrSentUpdatesTimeout = new AtomicInteger();
/**
* Number of updates received from the server in assured safe data mode.
*/
- protected int assuredSdReceivedUpdates = 0;
+ private int assuredSdReceivedUpdates = 0;
/**
* Number of updates received from the server in assured safe data mode that
* timed out.
*/
- protected AtomicInteger assuredSdReceivedUpdatesTimeout = new AtomicInteger();
+ private final AtomicInteger assuredSdReceivedUpdatesTimeout = new AtomicInteger();
/**
* Number of updates sent to the server in assured safe data mode.
*/
- protected int assuredSdSentUpdates = 0;
+ private int assuredSdSentUpdates = 0;
/**
- * Number of updates sent to the server in assured safe data mode that timed
- * out.
+ * Number of updates sent to the server in assured safe data mode that timed out.
*/
- protected AtomicInteger assuredSdSentUpdatesTimeout = new AtomicInteger();
+ private final AtomicInteger assuredSdSentUpdatesTimeout = new AtomicInteger();
/**
* The associated ServerWriter that sends messages to the remote server.
@@ -301,7 +300,8 @@
// sendWindow MUST be created before starting the writer
sendWindow = new Semaphore(sendWindowSize);
- writer = new ServerWriter(session, this, replicationServerDomain);
+ writer = new ServerWriter(session, this, replicationServerDomain,
+ replicationServer.getDSRSShutdownSync());
reader = new ServerReader(session, this);
session.setName("Replication server RS(" + getReplicationServerId()
@@ -626,7 +626,7 @@
* Increment the number of updates sent to the server in assured safe data
* mode.
*/
- public void incrementAssuredSdSentUpdates()
+ private void incrementAssuredSdSentUpdates()
{
assuredSdSentUpdates++;
}
@@ -662,7 +662,7 @@
* Increment the number of updates sent to the server in assured safe read
* mode.
*/
- public void incrementAssuredSrSentUpdates()
+ private void incrementAssuredSrSentUpdates()
{
assuredSrSentUpdates++;
}
--
Gitblit v1.10.0