From e95d2b4182b468a4e7d206fb11104098beef3b46 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 03 Jan 2014 11:25:19 +0000
Subject: [PATCH] OPENDJ-1205 Remove network layer from External ChangeLog implementation
---
opends/src/server/org/opends/server/workflowelement/externalchangelog/ECLSearchOperation.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/opends/src/server/org/opends/server/workflowelement/externalchangelog/ECLSearchOperation.java b/opends/src/server/org/opends/server/workflowelement/externalchangelog/ECLSearchOperation.java
index e71bd28..919b038 100644
--- a/opends/src/server/org/opends/server/workflowelement/externalchangelog/ECLSearchOperation.java
+++ b/opends/src/server/org/opends/server/workflowelement/externalchangelog/ECLSearchOperation.java
@@ -55,6 +55,10 @@
import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
+import static org.opends.server.replication.protocol.StartECLSessionMsg
+.ECLRequestType.*;
+import static org.opends.server.replication.protocol.StartECLSessionMsg
+.Persistent.*;
import static org.opends.server.util.LDIFWriter.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -205,8 +209,7 @@
// Set default behavior as "from change number".
// "from cookie" is set only when cookie is provided.
- startECLSessionMsg.setECLRequestType(
- StartECLSessionMsg.REQUEST_TYPE_FROM_CHANGE_NUMBER);
+ startECLSessionMsg.setECLRequestType(REQUEST_TYPE_FROM_CHANGE_NUMBER);
// Set a string operationId that will help correlate any error message
// logged for this operation with the 'real' client operation.
@@ -397,8 +400,7 @@
returnECLControl = true;
if (cookie != null)
{
- startECLSessionMsg.setECLRequestType(
- StartECLSessionMsg.REQUEST_TYPE_FROM_COOKIE);
+ startECLSessionMsg.setECLRequestType(REQUEST_TYPE_FROM_COOKIE);
startECLSessionMsg.setCrossDomainServerState(cookie.toString());
}
}
@@ -523,11 +525,9 @@
// If we're only interested in changes, then we don't actually want
// to process the search now.
if (psearchControl.getChangesOnly())
- startECLSessionMsg.setPersistent(
- StartECLSessionMsg.PERSISTENT_CHANGES_ONLY);
+ startECLSessionMsg.setPersistent(PERSISTENT_CHANGES_ONLY);
else
- startECLSessionMsg.setPersistent(
- StartECLSessionMsg.PERSISTENT);
+ startECLSessionMsg.setPersistent(PERSISTENT);
}
else if (OID_LDAP_SUBENTRIES.equals(oid))
{
--
Gitblit v1.10.0