From 0bd57577bb85119b2b4495c5ef525ba189d8d17c Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Wed, 04 Mar 2015 23:14:55 +0000
Subject: [PATCH] OPENDJ-1848: in-line and remove various storage related access methods from DatabaseContainer.

---
 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryCachePreloader.java |   32 ++++++++++++++------------------
 1 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryCachePreloader.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryCachePreloader.java
index b4bc534..999e242 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryCachePreloader.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryCachePreloader.java
@@ -136,24 +136,18 @@
   private static final int bytesPerMegabyte = 1024*1024;
 
   /**
-   * Constructs the Entry Cache Pre-loader for
-   * a given JEB implementation instance.
+   * Constructs the Entry Cache Pre-loader for a given JEB implementation instance.
    *
-   * @param  jeb  The JEB instance to pre-load.
+   * @param jeb
+   *          The JEB instance to pre-load.
    */
   public EntryCachePreloader(BackendImpl<?> jeb)
   {
     // These should not be exposed as configuration
     // parameters and are only useful for testing.
-    syncSleepTime = Long.getLong(
-      "org.opends.server.entrycache.preload.sleep",
-      PRELOAD_DEFAULT_SLEEP_TIME);
-    queueCapacity = Integer.getInteger(
-      "org.opends.server.entrycache.preload.queue",
-      PRELOAD_DEFAULT_QUEUE_CAPACITY);
-    entryQueue =
-      new LinkedBlockingQueue<PreloadEntry>(
-      queueCapacity);
+    syncSleepTime = Long.getLong("org.opends.server.entrycache.preload.sleep", PRELOAD_DEFAULT_SLEEP_TIME);
+    queueCapacity = Integer.getInteger("org.opends.server.entrycache.preload.queue", PRELOAD_DEFAULT_QUEUE_CAPACITY);
+    entryQueue = new LinkedBlockingQueue<PreloadEntry>(queueCapacity);
     this.backend = jeb;
   }
 
@@ -305,11 +299,12 @@
     public void run() {
       Cursor cursor = null;
       ID2Entry id2entry = null;
-      Collection<EntryContainer> entryContainers =
-        backend.getRootContainer().getEntryContainers();
-      Iterator<EntryContainer> ecIterator =
-        entryContainers.iterator();
-      boolean success = true;
+      RootContainer rootContainer = backend.getRootContainer();
+      Collection<EntryContainer> entryContainers = rootContainer.getEntryContainers();
+      Iterator<EntryContainer> ecIterator = entryContainers.iterator();
+
+      // FIXME: this loop needs fixing.
+      boolean success = false;
 
       try {
         while (success) {
@@ -325,7 +320,8 @@
                 break;
               }
               if (id2entry != null) {
-                cursor = id2entry.openCursor(null);
+                // FIXME: "null" should be a transaction.
+                // cursor = null.openCursor(id2entry.getName());
               } else {
                 continue;
               }

--
Gitblit v1.10.0