From 6c5c0af35aabc59a56c71e9c9296a7398a3e9176 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 25 Nov 2015 15:09:53 +0000
Subject: [PATCH] OPENDJ-2337 Remove JE changelog code
---
opendj-server-legacy/src/test/java/org/opends/server/replication/ReplicationTestCase.java | 23 ++---------------------
1 files changed, 2 insertions(+), 21 deletions(-)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/ReplicationTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/ReplicationTestCase.java
index f0b7868..cbbcfb8 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/ReplicationTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/ReplicationTestCase.java
@@ -44,7 +44,6 @@
import org.forgerock.opendj.ldap.SearchScope;
import org.opends.server.DirectoryServerTestCase;
import org.opends.server.TestCaseUtils;
-import org.opends.server.admin.std.meta.ReplicationServerCfgDefn.ReplicationDBImplementation;
import org.opends.server.admin.std.server.ReplicationDomainCfg;
import org.opends.server.backends.task.TaskState;
import org.opends.server.core.AddOperation;
@@ -64,7 +63,6 @@
import org.opends.server.replication.protocol.Session;
import org.opends.server.replication.server.ReplicationServer;
import org.opends.server.replication.server.changelog.file.FileChangelogDB;
-import org.opends.server.replication.server.changelog.je.JEChangelogDB;
import org.opends.server.replication.service.ReplicationBroker;
import org.opends.server.types.Attribute;
import org.opends.server.types.Attributes;
@@ -122,9 +120,6 @@
private static final String REPLICATION_DB_IMPL_PROPERTY = "org.opends.test.replicationDbImpl";
- public static ReplicationDBImplementation replicationDbImplementation = ReplicationDBImplementation.valueOf(
- System.getProperty(REPLICATION_DB_IMPL_PROPERTY, ReplicationDBImplementation.LOG.name()));
-
/** Replication monitor stats. */
private DN monitorDN;
private String monitorAttr;
@@ -376,16 +371,7 @@
protected void clearChangelogDB(ReplicationServer rs) throws Exception
{
- if (rs == null)
- {
- return;
- }
-
- if (replicationDbImplementation == ReplicationDBImplementation.JE)
- {
- ((JEChangelogDB) rs.getChangelogDB()).clearDB();
- }
- else
+ if (rs != null)
{
((FileChangelogDB) rs.getChangelogDB()).clearDB();
}
@@ -581,7 +567,7 @@
return null;
}
});
-
+
Entry entry = DirectoryServer.getEntry(dn);
if (entry != null)
{
@@ -934,9 +920,4 @@
}
});
}
-
- protected static void setReplicationDBImplementation(ReplicationDBImplementation impl)
- {
- replicationDbImplementation = impl;
- }
}
--
Gitblit v1.10.0