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/ReplicationServerDomain.java | 23 +++++------------------
1 files changed, 5 insertions(+), 18 deletions(-)
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
{
--
Gitblit v1.10.0