From 3146a8645a0ddfeff06ff44dd3fa8579ba182292 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Tue, 16 Sep 2014 07:55:01 +0000
Subject: [PATCH] Revert from usage of forgerock-util module to equivalent classes from SDK in order to fix build after switch back from OpenDJ SDK 3.0.0-SNAPSHOT to 2.6.10-SNAPSHOT
---
opends/src/server/org/opends/server/replication/server/changelog/file/BlockLogReader.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/server/changelog/file/BlockLogReader.java b/opends/src/server/org/opends/server/replication/server/changelog/file/BlockLogReader.java
index 7bb2ce0..38f5e6f 100644
--- a/opends/src/server/org/opends/server/replication/server/changelog/file/BlockLogReader.java
+++ b/opends/src/server/org/opends/server/replication/server/changelog/file/BlockLogReader.java
@@ -25,6 +25,8 @@
*/
package org.opends.server.replication.server.changelog.file;
+import static com.forgerock.opendj.util.Validator.*;
+
import static org.opends.messages.ReplicationMessages.*;
import static org.opends.server.replication.server.changelog.api.DBCursor.KeyMatchingStrategy.*;
import static org.opends.server.replication.server.changelog.api.DBCursor.PositionStrategy.*;
@@ -35,7 +37,6 @@
import java.io.IOException;
import java.io.RandomAccessFile;
-import org.forgerock.util.Reject;
import org.opends.server.replication.server.changelog.api.ChangelogException;
import org.opends.server.replication.server.changelog.api.DBCursor.KeyMatchingStrategy;
import org.opends.server.replication.server.changelog.api.DBCursor.PositionStrategy;
@@ -164,7 +165,7 @@
final PositionStrategy positionStrategy)
throws ChangelogException
{
- Reject.checkNotNull(key);
+ ensureNotNull(key);
final long markerPosition = searchClosestBlockStartToKey(key);
if (markerPosition >= 0)
{
--
Gitblit v1.10.0