From ac27a41b85595ecd2444a64d822ab37aa8722fed Mon Sep 17 00:00:00 2001
From: Yannick Lecaillez <yannick.lecaillez@forgerock.com>
Date: Thu, 21 May 2015 09:34:32 +0000
Subject: [PATCH] Use backendID for entry cache rather than backend instance. RootContainer is now directly constructed with the Storage rather than getting it from the Backend.
---
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendImpl.java | 10 +++-------
1 files changed, 3 insertions(+), 7 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 29d41a7..08cff51 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
@@ -88,7 +88,7 @@
private Storage storage;
/** The controls supported by this backend. */
- private static final Set<String> supportedControls = new HashSet<String>(Arrays.asList(
+ private static final Set<String> supportedControls = new HashSet<>(Arrays.asList(
OID_SUBTREE_DELETE_CONTROL,
OID_PAGED_RESULTS_CONTROL,
OID_MANAGE_DSAIT_CONTROL,
@@ -146,7 +146,7 @@
@Override
public void configureBackend(C cfg, ServerContext serverContext) throws ConfigException
{
- Reject.ifNull(cfg);
+ Reject.ifNull(cfg, "cfg must not be null");
this.cfg = cfg;
baseDNs = this.cfg.getBaseDN().toArray(new DN[0]);
@@ -981,7 +981,7 @@
throws ConfigException, InitializationException {
// Open the storage
try {
- RootContainer rc = new RootContainer(this, cfg);
+ final RootContainer rc = new RootContainer(getBackendID(), storage, cfg);
rc.open();
return rc;
}
@@ -991,8 +991,4 @@
}
}
- Storage getStorage()
- {
- return storage;
- }
}
--
Gitblit v1.10.0