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/Log.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/server/changelog/file/Log.java b/opends/src/server/org/opends/server/replication/server/changelog/file/Log.java
index bff1def..1402a89 100644
--- a/opends/src/server/org/opends/server/replication/server/changelog/file/Log.java
+++ b/opends/src/server/org/opends/server/replication/server/changelog/file/Log.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.util.StaticUtils.*;
@@ -46,7 +48,6 @@
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
-import org.forgerock.util.Reject;
import org.opends.messages.Category;
import org.opends.messages.Message;
import org.opends.messages.Severity;
@@ -210,7 +211,7 @@
static synchronized <K extends Comparable<K>, V> Log<K, V> openLog(final File logPath,
final RecordParser<K, V> parser, final long sizeLimitPerFileInBytes) throws ChangelogException
{
- Reject.ifNull(logPath, parser);
+ ensureNotNull(logPath, parser);
@SuppressWarnings("unchecked")
Log<K, V> log = (Log<K, V>) logsCache.get(logPath);
if (log == null)
--
Gitblit v1.10.0