From 5d17d3fc157b4d05825d04050c1f80b0e3dbbbdc Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 20 May 2015 10:23:50 +0000
Subject: [PATCH] Importer.java: Renamed Importer to OnDiskMergeBufferImporter Used the simple name "Importer" rather than the fully qualified name "org.opends.server.backends.pluggable.spi.Importer"

---
 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendImpl.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendImpl.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendImpl.java
index 34b08ca..29d41a7 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendImpl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendImpl.java
@@ -640,7 +640,7 @@
 
     try
     {
-      if (Importer.mustClearBackend(importConfig, cfg))
+      if (OnDiskMergeBufferImporter.mustClearBackend(importConfig, cfg))
       {
         try
         {
@@ -694,7 +694,7 @@
   private ImportStrategy getImportStrategy() throws DirectoryException
   {
     // TODO JNR may call new SuccessiveAddsImportStrategy() depending on configured import strategy
-    return new Importer.StrategyImpl(cfg);
+    return new OnDiskMergeBufferImporter.StrategyImpl(cfg);
   }
 
   /** {@inheritDoc} */
@@ -767,7 +767,7 @@
       {
         rootContainer = initializeRootContainer();
       }
-      new Importer(rootContainer, rebuildConfig, cfg, serverContext).rebuildIndexes();
+      new OnDiskMergeBufferImporter(rootContainer, rebuildConfig, cfg, serverContext).rebuildIndexes();
     }
     catch (ExecutionException execEx)
     {

--
Gitblit v1.10.0