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/ImportTask.java |   11 +++--------
 1 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/opends/src/server/org/opends/server/tasks/ImportTask.java b/opends/src/server/org/opends/server/tasks/ImportTask.java
index 1234638..c3e9a41 100644
--- a/opends/src/server/org/opends/server/tasks/ImportTask.java
+++ b/opends/src/server/org/opends/server/tasks/ImportTask.java
@@ -42,7 +42,6 @@
 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;
@@ -285,7 +284,6 @@
 
     // Get the backend into which the LDIF should be imported.
     Backend       backend;
-    ConfigEntry   configEntry;
     ArrayList<DN> defaultIncludeBranches;
     ArrayList<DN> excludeBranches = new ArrayList<DN>();
 
@@ -308,9 +306,6 @@
       return TaskState.STOPPED_BY_ERROR;
     }
 
-    // Get the config entry for this backend.
-    configEntry = TaskUtils.getConfigEntry(backend);
-
     // Find backends with subordinate base DNs that should be excluded from the
     // import.
 
@@ -479,7 +474,7 @@
     // Disable the backend.
     try
     {
-      TaskUtils.setBackendEnabled(configEntry, false);
+      TaskUtils.disableBackend(backendID);
     }
     catch (DirectoryException e)
     {
@@ -530,7 +525,7 @@
       // Launch the import.
       try
       {
-        backend.importLDIF(configEntry, baseDNs, importConfig);
+        backend.importLDIF(importConfig);
       }
       catch (DirectoryException de)
       {
@@ -599,7 +594,7 @@
       // Enable the backend.
       try
       {
-        TaskUtils.setBackendEnabled(configEntry, true);
+        TaskUtils.enableBackend(backendID);
         // It is necessary to retrieve the backend structure again
         // because disabling and enabling it again may have resulted
         // in a new backend being registered to the server.

--
Gitblit v1.10.0