From 1daf5cb96fa1ba13d2d7517ef15f9ebd44cf071f Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Fri, 09 Sep 2016 09:45:25 +0000
Subject: [PATCH] OPENDJ-3089 Fix failing tests in SchemaBackendTestCase and TestEntry
---
opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java
index 355a008..ab751bb 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java
@@ -17,7 +17,6 @@
package org.opends.server.backends;
import static org.forgerock.opendj.ldap.schema.SchemaOptions.STRIP_UPPER_BOUND_FOR_ATTRIBUTE_TYPE;
-
import static org.forgerock.opendj.ldap.schema.CoreSchema.*;
import static org.forgerock.util.Reject.*;
import static org.opends.messages.BackendMessages.*;
@@ -69,6 +68,7 @@
import org.forgerock.opendj.ldap.schema.SchemaElement;
import org.forgerock.opendj.ldap.schema.Syntax;
import org.forgerock.opendj.server.config.server.SchemaBackendCfg;
+import org.forgerock.util.Reject;
import org.opends.server.api.AlertGenerator;
import org.opends.server.api.Backend;
import org.opends.server.api.Backupable;
@@ -168,6 +168,7 @@
@Override
public void configureBackend(SchemaBackendCfg cfg, ServerContext serverContext) throws ConfigException
{
+ Reject.ifNull(serverContext);
this.serverContext = serverContext;
this.schemaHandler = serverContext.getSchemaHandler();
@@ -177,7 +178,6 @@
{
throw new ConfigException(ERR_SCHEMA_CONFIG_ENTRY_NULL.get());
}
-
Entry configEntry = DirectoryServer.getConfigEntry(cfg.dn());
configEntryDN = configEntry.getName();
--
Gitblit v1.10.0