From fa134ddc24346bbb579197f38a491d86695f0dd0 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Wed, 04 Sep 2013 09:42:08 +0000
Subject: [PATCH] Remove TestCaseUtils.clearJEBackend2() and use existing clearJEBackend() method.
---
opends/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java | 58 ----------------------------------------------------------
1 files changed, 0 insertions(+), 58 deletions(-)
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java
index a0f584e..eca0a27 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java
@@ -50,7 +50,6 @@
import org.opends.server.core.AddOperation;
import org.opends.server.core.DeleteOperation;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.core.LockFileManager;
import org.opends.server.extensions.ConfigFileHandler;
import org.opends.server.loggers.*;
import org.opends.server.loggers.debug.DebugLogger;
@@ -64,7 +63,6 @@
import org.opends.server.protocols.ldap.BindResponseProtocolOp;
import org.opends.server.protocols.ldap.LDAPMessage;
import org.opends.server.protocols.ldap.LDAPReader;
-import org.opends.server.tasks.TaskUtils;
import org.opends.server.tools.LDAPModify;
import org.opends.server.tools.dsconfig.DSConfig;
import org.opends.server.types.*;
@@ -953,62 +951,6 @@
}
/**
- * Clears all the entries from the JE backend determined by the be id passed
- * into the method.
- *
- * @param createBaseEntry
- * Indicate whether to automatically create the base entry and add it
- * to the backend.
- * @param beID
- * The be id to clear.
- * @param dn
- * The suffix of the backend to create if the the createBaseEntry
- * boolean is true.
- * @throws Exception
- * If an unexpected problem occurs.
- */
- public static void clearJEBackend2(boolean createBaseEntry, String beID, String dn)
- throws Exception
- {
- BackendImpl backend = (BackendImpl) DirectoryServer.getBackend(beID);
-
- // FIXME Should setBackendEnabled be part of TaskUtils ?
- TaskUtils.disableBackend(beID);
-
- try
- {
- String lockFile = LockFileManager.getBackendLockFileName(backend);
- StringBuilder failureReason = new StringBuilder();
-
- if (!LockFileManager.acquireExclusiveLock(lockFile, failureReason))
- {
- throw new RuntimeException(failureReason.toString());
- }
-
- try
- {
- backend.clearBackend();
- }
- finally
- {
- LockFileManager.releaseLock(lockFile, failureReason);
- }
- }
- finally
- {
- TaskUtils.enableBackend(beID);
- }
-
- if (createBaseEntry)
- {
- DN baseDN = DN.decode(dn);
- Entry e = createEntry(baseDN);
- backend = (BackendImpl) DirectoryServer.getBackend(beID);
- backend.addEntry(e, null);
- }
- }
-
- /**
* This was used to track down which test was trashing the indexes. We left it
* here because it might be useful again.
*/
--
Gitblit v1.10.0