From aa13314e109575f7d5b41b42f5144910ea7e6202 Mon Sep 17 00:00:00 2001
From: kenneth_suter <kenneth_suter@localhost>
Date: Fri, 31 Aug 2007 15:55:43 +0000
Subject: [PATCH] Prevents an NPE in cases where the directory server cannot start and must shutdown before the entry cache has been created.
---
opends/src/server/org/opends/server/core/DirectoryServer.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/opends/src/server/org/opends/server/core/DirectoryServer.java b/opends/src/server/org/opends/server/core/DirectoryServer.java
index bde7bd0..028bad1 100644
--- a/opends/src/server/org/opends/server/core/DirectoryServer.java
+++ b/opends/src/server/org/opends/server/core/DirectoryServer.java
@@ -8348,7 +8348,11 @@
}
// Finalize the entry cache.
- DirectoryServer.getEntryCache().finalizeEntryCache();
+ EntryCache ec = DirectoryServer.getEntryCache();
+ if (ec != null)
+ {
+ ec.finalizeEntryCache();
+ }
// Release the exclusive lock for the Directory Server process.
String lockFile = LockFileManager.getServerLockFileName();
--
Gitblit v1.10.0