From 8b3cd28204e15e0a98ce038b355f100cd7c44e3c Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <capponi.nicolas@gmail.com>
Date: Thu, 28 Jan 2016 08:28:20 +0000
Subject: [PATCH] OPENDJ-1632 (PR-201) Migrate AttributeType in one shot
---
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendImpl.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendImpl.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendImpl.java
index 4eee4d4..2383c38 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendImpl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendImpl.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2007-2010 Sun Microsystems, Inc.
- * Portions Copyright 2013-2015 ForgeRock AS
+ * Portions Copyright 2013-2016 ForgeRock AS
*/
package org.opends.server.backends.pluggable;
@@ -66,7 +66,7 @@
import org.opends.server.core.ModifyOperation;
import org.opends.server.core.SearchOperation;
import org.opends.server.core.ServerContext;
-import org.opends.server.types.AttributeType;
+import org.forgerock.opendj.ldap.schema.AttributeType;
import org.opends.server.types.BackupConfig;
import org.opends.server.types.BackupDirectory;
import org.opends.server.types.CanceledOperationException;
@@ -123,6 +123,8 @@
OID_SERVER_SIDE_SORT_REQUEST_CONTROL,
OID_VLV_REQUEST_CONTROL);
+ private ServerContext serverContext;
+
/**
* Begin a Backend API method that accesses the {@link EntryContainer} for <code>entryDN</code>
* and returns it.
@@ -177,6 +179,7 @@
Reject.ifNull(cfg, "cfg must not be null");
this.cfg = cfg;
+ this.serverContext = serverContext;
baseDNs = this.cfg.getBaseDN().toArray(new DN[0]);
storage = new TracedStorage(configureStorage(cfg, serverContext), cfg.getBackendId());
}
@@ -1021,7 +1024,7 @@
throws ConfigException, InitializationException {
// Open the storage
try {
- final RootContainer rc = new RootContainer(getBackendID(), storage, cfg);
+ final RootContainer rc = new RootContainer(getBackendID(), serverContext, storage, cfg);
rc.open(accessMode);
return rc;
}
--
Gitblit v1.10.0