From 35af51f9683f5ef8cec66baca7b89aa1e1cbc44e Mon Sep 17 00:00:00 2001
From: coulbeck <coulbeck@localhost>
Date: Fri, 11 May 2007 23:27:30 +0000
Subject: [PATCH] Issue 1532: Remove ConfigEntry from Backend API. (DS-1532)
---
opends/src/server/org/opends/server/tasks/ExportTask.java | 12 +++---------
1 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/opends/src/server/org/opends/server/tasks/ExportTask.java b/opends/src/server/org/opends/server/tasks/ExportTask.java
index 1b6ebd6..cbb902c 100644
--- a/opends/src/server/org/opends/server/tasks/ExportTask.java
+++ b/opends/src/server/org/opends/server/tasks/ExportTask.java
@@ -32,14 +32,12 @@
import static org.opends.server.messages.ToolMessages.*;
import static org.opends.server.messages.MessageHandler.getMessage;
import static org.opends.server.util.StaticUtils.*;
-import static org.opends.server.loggers.ErrorLogger.logError;
import org.opends.server.backends.task.Task;
import org.opends.server.backends.task.TaskState;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.LockFileManager;
import org.opends.server.api.Backend;
import org.opends.server.api.ClientConnection;
-import org.opends.server.config.ConfigEntry;
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeType;
import org.opends.server.types.DirectoryException;
@@ -311,7 +309,6 @@
// Get the backend into which the LDIF should be imported.
Backend backend;
- ConfigEntry configEntry;
ArrayList<DN> defaultIncludeBranches;
backend = DirectoryServer.getBackend(backendID);
@@ -333,9 +330,6 @@
return TaskState.STOPPED_BY_ERROR;
}
- // Get the config entry for this backend.
- configEntry = TaskUtils.getConfigEntry(backend);
-
defaultIncludeBranches = new ArrayList<DN>(backend.getBaseDNs().length);
for (DN dn : backend.getBaseDNs())
{
@@ -347,7 +341,7 @@
{
for (String s : excludeBranchStrings)
{
- DN excludeBranch = null;
+ DN excludeBranch;
try
{
excludeBranch = DN.decode(s);
@@ -383,7 +377,7 @@
includeBranches = new ArrayList<DN>();
for (String s : includeBranchStrings)
{
- DN includeBranch = null;
+ DN includeBranch;
try
{
includeBranch = DN.decode(s);
@@ -493,7 +487,7 @@
try
{
DirectoryServer.notifyExportBeginning(backend, exportConfig);
- backend.exportLDIF(configEntry, baseDNs, exportConfig);
+ backend.exportLDIF(exportConfig);
DirectoryServer.notifyExportEnded(backend, exportConfig, true);
}
catch (DirectoryException de)
--
Gitblit v1.10.0