From ec7532654a58b10c572ab73ebef4e6acfab58cd9 Mon Sep 17 00:00:00 2001
From: ludovicp <ludovicp@localhost>
Date: Fri, 28 May 2010 09:55:34 +0000
Subject: [PATCH] Fix issue triggered by verify-index with --clean option.
---
opendj-sdk/opends/src/server/org/opends/server/types/Entry.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/Entry.java b/opendj-sdk/opends/src/server/org/opends/server/types/Entry.java
index 1a9a451..e7dc0e8 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/Entry.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/Entry.java
@@ -50,6 +50,7 @@
import org.opends.server.api.plugin.PluginResult;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.PluginConfigManager;
+import org.opends.server.core.SubentryManager;
import org.opends.server.util.LDIFException;
import static org.opends.server.config.ConfigConstants.*;
@@ -3466,10 +3467,18 @@
return;
}
+ SubentryManager manager =
+ DirectoryServer.getSubentryManager();
+ if(manager == null)
+ {
+ //Subentry manager may not have been initialized by
+ //a component that doesn't require it.
+ return;
+ }
// Get applicable collective subentries.
List<SubEntry> collectiveAttrSubentries =
- DirectoryServer.getSubentryManager(
- ).getCollectiveSubentries(this);
+ manager.getCollectiveSubentries(this);
+
if ((collectiveAttrSubentries == null) ||
collectiveAttrSubentries.isEmpty())
{
--
Gitblit v1.10.0