From 157717b205d4c1f957cf810e04e06f11530c619c Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 02 Sep 2013 08:57:43 +0000
Subject: [PATCH] Renamed: - ChangeNumber to CSN - ChangeNumberGenerator to CSNGenerator - ChangeNumberTest to CSNTest - ChangeNumberGeneratorTest to CSNGeneratorTest
---
opends/src/server/org/opends/server/replication/plugin/PendingChange.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/plugin/PendingChange.java b/opends/src/server/org/opends/server/replication/plugin/PendingChange.java
index 0bc994e..b6e3e37 100644
--- a/opends/src/server/org/opends/server/replication/plugin/PendingChange.java
+++ b/opends/src/server/org/opends/server/replication/plugin/PendingChange.java
@@ -23,10 +23,11 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions copyright 2013 ForgeRock AS
*/
package org.opends.server.replication.plugin;
-import org.opends.server.replication.common.ChangeNumber;
+import org.opends.server.replication.common.CSN;
import org.opends.server.replication.common.ServerState;
import org.opends.server.replication.protocol.LDAPUpdateMsg;
import org.opends.server.types.DN;
@@ -39,12 +40,12 @@
*/
public class PendingChange implements Comparable<PendingChange>
{
- private ChangeNumber changeNumber;
+ private CSN changeNumber;
private boolean committed;
private LDAPUpdateMsg msg;
private PluginOperation op;
- private ServerState dependencyState = null;
- private DN targetDN = null;
+ private ServerState dependencyState;
+ private DN targetDN;
/**
* Construct a new PendingChange.
@@ -52,7 +53,7 @@
* @param op the operation to use
* @param msg the message to use (can be null for local operations)
*/
- public PendingChange(ChangeNumber changeNumber,
+ public PendingChange(CSN changeNumber,
PluginOperation op,
LDAPUpdateMsg msg)
{
@@ -84,7 +85,7 @@
* Get the ChangeNumber associated to this PendingChange.
* @return the ChangeNumber
*/
- public ChangeNumber getChangeNumber()
+ public CSN getCSN()
{
return changeNumber;
}
@@ -133,7 +134,7 @@
* @param changeNumber The ChangeNumber to add in the list of dependencies
* of this PendingChange.
*/
- public void addDependency(ChangeNumber changeNumber)
+ public void addDependency(CSN changeNumber)
{
if (dependencyState == null)
{
@@ -184,8 +185,9 @@
/**
* {@inheritDoc}
*/
+ @Override
public int compareTo(PendingChange o)
{
- return this.getChangeNumber().compareTo(o.getChangeNumber());
+ return this.getCSN().compareTo(o.getCSN());
}
}
--
Gitblit v1.10.0