From 07347aac048a14dc5fa1a5c1d02426230622051d Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 02 Aug 2013 13:26:30 +0000
Subject: [PATCH] serviceId => baseDN (To make the code less confusing)
---
opends/src/server/org/opends/server/replication/protocol/StartECLSessionMsg.java | 36 +++++++++++++++++++-----------------
1 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/protocol/StartECLSessionMsg.java b/opends/src/server/org/opends/server/replication/protocol/StartECLSessionMsg.java
index 9e51ac5..d5a93d7 100644
--- a/opends/src/server/org/opends/server/replication/protocol/StartECLSessionMsg.java
+++ b/opends/src/server/org/opends/server/replication/protocol/StartECLSessionMsg.java
@@ -37,7 +37,6 @@
import org.opends.server.replication.common.ChangeNumber;
import org.opends.server.util.StaticUtils;
-
/**
* This class specifies the parameters of a search request on the ECL.
* It is used as an interface between the requestor (plugin part)
@@ -115,7 +114,7 @@
private String operationId = "";
/** Excluded domains. */
- private Set<String> excludedServiceIDs = new HashSet<String>();
+ private Set<String> excludedBaseDNs = new HashSet<String>();
/**
* Creates a new StartSessionMsg message from its encoded form.
@@ -189,7 +188,7 @@
if (excludedDNsString.length()>0)
{
String[] excludedDNsStr = excludedDNsString.split(";");
- Collections.addAll(this.excludedServiceIDs, excludedDNsStr);
+ Collections.addAll(this.excludedBaseDNs, excludedDNsStr);
}
pos += length + 1;
@@ -214,7 +213,7 @@
changeNumber = new ChangeNumber(0,0,0);
isPersistent = NON_PERSISTENT;
operationId = "-1";
- excludedServiceIDs = new HashSet<String>();
+ excludedBaseDNs = new HashSet<String>();
}
/**
@@ -223,8 +222,8 @@
@Override
public byte[] getBytes(short protocolVersion)
{
- String excludedSIDsString =
- StaticUtils.collectionToString(excludedServiceIDs, ";");
+ String excludedBaseDNsString =
+ StaticUtils.collectionToString(excludedBaseDNs, ";");
try
{
@@ -243,7 +242,7 @@
byte[] byteOperationId =
String.valueOf(operationId).getBytes("UTF-8");
byte[] byteExcludedDNs =
- String.valueOf(excludedSIDsString).getBytes("UTF-8");
+ String.valueOf(excludedBaseDNsString).getBytes("UTF-8");
int length =
byteMode.length + 1 +
@@ -291,7 +290,7 @@
" lastDraftChangeNumber=" + lastDraftChangeNumber +
" generalizedState=" + crossDomainServerState +
" operationId=" + operationId +
- " excludedDNs=" + excludedServiceIDs + "]";
+ " excludedDNs=" + excludedBaseDNs + "]";
}
/**
@@ -403,7 +402,7 @@
/**
* Setter of the operation id.
- * @param operationId The provided opration id.
+ * @param operationId The provided operation id.
*/
public void setOperationId(String operationId)
{
@@ -420,21 +419,24 @@
}
/**
- * Getter on the list of excluded ServiceIDs.
- * @return the list of excluded ServiceIDs.
+ * Getter on the list of excluded baseDNs.
+ *
+ * @return the list of excluded baseDNs.
*/
- public Set<String> getExcludedServiceIDs()
+ public Set<String> getExcludedBaseDNs()
{
- return this.excludedServiceIDs;
+ return this.excludedBaseDNs;
}
/**
- * Setter on the list of excluded ServiceIDs.
- * @param excludedServiceIDs the provided list of excluded ServiceIDs.
+ * Setter on the list of excluded baseDNs.
+ *
+ * @param excludedBaseDNs
+ * the provided list of excluded baseDNs.
*/
- public void setExcludedDNs(Set<String> excludedServiceIDs)
+ public void setExcludedDNs(Set<String> excludedBaseDNs)
{
- this.excludedServiceIDs = excludedServiceIDs;
+ this.excludedBaseDNs = excludedBaseDNs;
}
}
--
Gitblit v1.10.0