From 7d4afa23f07f3a4471fd5b71ff8e04ae4c928387 Mon Sep 17 00:00:00 2001
From: abobrov <abobrov@localhost>
Date: Thu, 07 Jun 2007 22:33:56 +0000
Subject: [PATCH] this splits initializeEntryCache() method in two, bringing initializeDefaultEntryCache() method that takes the default cache initialization out of initializeEntryCache() method. the default entry cache will be initialized before backends initialization thus resolving issues like NPE via AciListenerManager etc.
---
opends/src/server/org/opends/server/core/DirectoryServer.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/opends/src/server/org/opends/server/core/DirectoryServer.java b/opends/src/server/org/opends/server/core/DirectoryServer.java
index 4735728..ae89e98 100644
--- a/opends/src/server/org/opends/server/core/DirectoryServer.java
+++ b/opends/src/server/org/opends/server/core/DirectoryServer.java
@@ -1067,6 +1067,12 @@
initializeAlertHandlers();
+ // Initialize the default entry cache. We have to have one before
+ // <CODE>initializeBackends()</CODE> method kicks in further down.
+ entryCacheConfigManager = new EntryCacheConfigManager();
+ entryCacheConfigManager.initializeDefaultEntryCache();
+
+
// Initialize the key manager provider.
keyManagerProviderConfigManager = new KeyManagerProviderConfigManager();
keyManagerProviderConfigManager.initializeKeyManagerProviders();
@@ -1101,8 +1107,8 @@
// Initialize all the backends and their associated suffixes.
initializeBackends();
- // Initialize the entry cache.
- entryCacheConfigManager = new EntryCacheConfigManager();
+ // Check for and initialize user configured entry cache if any,
+ // if not stick with default entry cache initialized earlier.
entryCacheConfigManager.initializeEntryCache();
// Reset the map as we can no longer guarantee offline state.
--
Gitblit v1.10.0