From ba94c1a3e88f8cc411a41ef0fec8633debd03d8e Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 06 Sep 2013 14:25:32 +0000
Subject: [PATCH] ReplicationServerDomain.java: Removed unused getGenerationIdSavedStatus(). Removed savedStatus parameter from changeGenerationId() and defaulted it to false since all callers were calling it with false.
---
opends/src/server/org/opends/server/replication/server/DataServerHandler.java | 3 ++-
opends/src/server/org/opends/server/replication/server/ReplicationServerHandler.java | 6 +++---
opends/src/server/org/opends/server/replication/server/ServerHandler.java | 2 +-
opends/src/server/org/opends/server/replication/server/ReplicationServerDomain.java | 23 +++++------------------
4 files changed, 11 insertions(+), 23 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/server/DataServerHandler.java b/opends/src/server/org/opends/server/replication/server/DataServerHandler.java
index 69517a6..26db6f2 100644
--- a/opends/src/server/org/opends/server/replication/server/DataServerHandler.java
+++ b/opends/src/server/org/opends/server/replication/server/DataServerHandler.java
@@ -593,6 +593,7 @@
Integer.toString(serverId));
throw new DirectoryException(ResultCode.OTHER, message);
}
+
this.refUrls = startSessionMsg.getReferralsURLs();
this.assuredFlag = startSessionMsg.isAssured();
this.assuredMode = startSessionMsg.getAssuredMode();
@@ -642,7 +643,7 @@
// to peer server as topo message must embed valid generation id
// for our server
oldGenerationId =
- replicationServerDomain.changeGenerationId(generationId, false);
+ replicationServerDomain.changeGenerationId(generationId);
}
}
return startSessionMsg;
diff --git a/opends/src/server/org/opends/server/replication/server/ReplicationServerDomain.java b/opends/src/server/org/opends/server/replication/server/ReplicationServerDomain.java
index d0d8025..c4e4eee 100644
--- a/opends/src/server/org/opends/server/replication/server/ReplicationServerDomain.java
+++ b/opends/src/server/org/opends/server/replication/server/ReplicationServerDomain.java
@@ -1188,7 +1188,7 @@
&& !generationIdSavedStatus
&& generationId != -1)
{
- changeGenerationId(-1, false);
+ changeGenerationId(-1);
}
}
@@ -1931,17 +1931,6 @@
}
/**
- * Get the generationId saved status.
- *
- * @return The generationId saved status.
- */
- public boolean getGenerationIdSavedStatus()
- {
- return generationIdSavedStatus;
- }
-
-
- /**
* Initialize the value of the generationID for this ReplicationServerDomain.
* This method is intended to be used for initialization at startup and
* simply stores the new value without any additional processing.
@@ -1963,10 +1952,9 @@
* Also clear the changelog databases.
*
* @param generationId The new value of generationId.
- * @param savedStatus The saved status of the generationId.
* @return The old generation id
*/
- public long changeGenerationId(long generationId, boolean savedStatus)
+ public long changeGenerationId(long generationId)
{
synchronized (generationIDLock)
{
@@ -1977,7 +1965,7 @@
clearDbs();
this.generationId = generationId;
- this.generationIdSavedStatus = savedStatus;
+ this.generationIdSavedStatus = false;
}
return oldGenerationId;
}
@@ -2016,11 +2004,10 @@
try
{
- long newGenId = genIdMsg.getGenerationId();
-
+ final long newGenId = genIdMsg.getGenerationId();
if (newGenId != this.generationId)
{
- changeGenerationId(newGenId, false);
+ changeGenerationId(newGenId);
}
else
{
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 07d83fb..b21a06b 100644
--- a/opends/src/server/org/opends/server/replication/server/ReplicationServerHandler.java
+++ b/opends/src/server/org/opends/server/replication/server/ReplicationServerHandler.java
@@ -195,8 +195,8 @@
*/
if (localGenerationId < 0 && generationId > 0)
{
- oldGenerationId = replicationServerDomain.changeGenerationId(
- generationId, false);
+ oldGenerationId =
+ replicationServerDomain.changeGenerationId(generationId);
}
logStartHandshakeSNDandRCV(outReplServerStartMsg,(ReplServerStartMsg)msg);
@@ -499,7 +499,7 @@
// WARNING: Must be done before computing topo message to send to peer
// server as topo message must embed valid generation id for our server
oldGenerationId =
- replicationServerDomain.changeGenerationId(generationId, false);
+ replicationServerDomain.changeGenerationId(generationId);
return;
}
diff --git a/opends/src/server/org/opends/server/replication/server/ServerHandler.java b/opends/src/server/org/opends/server/replication/server/ServerHandler.java
index c0c428d..5234bcd 100644
--- a/opends/src/server/org/opends/server/replication/server/ServerHandler.java
+++ b/opends/src/server/org/opends/server/replication/server/ServerHandler.java
@@ -254,7 +254,7 @@
// case retrieve old value of generation id for replication server domain
if (oldGenerationId != -100 && replicationServerDomain != null)
{
- replicationServerDomain.changeGenerationId(oldGenerationId, false);
+ replicationServerDomain.changeGenerationId(oldGenerationId);
}
}
--
Gitblit v1.10.0