From c1e621ed00ff0a0110f2752a23b794d92fc7aeaf Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 18 Feb 2014 11:01:30 +0000
Subject: [PATCH] OPENDJ-1308 Migrate schema support
---
opendj3-server-dev/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java b/opendj3-server-dev/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java
index 00ce914..67ee81d 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java
@@ -68,6 +68,7 @@
import org.opends.server.tasks.PurgeConflictsHistoricalTask;
import org.opends.server.tasks.TaskUtils;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.types.operation.*;
import org.opends.server.util.LDIFReader;
import org.opends.server.util.TimeThread;
@@ -79,7 +80,7 @@
import static org.opends.server.replication.plugin.EntryHistorical.*;
import static org.opends.server.replication.protocol.OperationContext.*;
import static org.opends.server.replication.service.ReplicationMonitor.*;
-import static org.opends.server.types.ResultCode.*;
+import static org.forgerock.opendj.ldap.ResultCode.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -661,7 +662,7 @@
&& search.getResultCode() != ResultCode.NO_SUCH_OBJECT)
{
logger.error(ERR_SEARCHING_GENERATION_ID,
- search.getResultCode().getResultCodeName() + " " + search.getErrorMessage(),
+ search.getResultCode().getName() + " " + search.getErrorMessage(),
getBaseDNString());
return false;
}
@@ -3358,7 +3359,7 @@
if (result != ResultCode.SUCCESS)
{
- logger.error(ERR_UPDATING_GENERATION_ID, result.getResultCodeName(), getBaseDNString());
+ logger.error(ERR_UPDATING_GENERATION_ID, result.getName(), getBaseDNString());
}
}
else
@@ -3411,7 +3412,7 @@
if (search.getResultCode() != ResultCode.NO_SUCH_OBJECT)
{
logger.error(ERR_SEARCHING_GENERATION_ID,
- search.getResultCode().getResultCodeName() + " " + search.getErrorMessage(),
+ search.getResultCode().getName() + " " + search.getErrorMessage(),
getBaseDNString());
}
}
--
Gitblit v1.10.0