From d035014ad8b0d2d4a0465f6c6dfcfa8e03f7ab84 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 Remove DirectoryServerContext.getSchemaNG() method and uses in classes
---
opendj-server-legacy/src/main/java/org/opends/server/api/CompressedSchema.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/api/CompressedSchema.java b/opendj-server-legacy/src/main/java/org/opends/server/api/CompressedSchema.java
index a848230..af9959c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/api/CompressedSchema.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/api/CompressedSchema.java
@@ -95,7 +95,7 @@
/** Schema used to build the compressed information. */
@GuardedBy("lock")
- private Schema schemaNG;
+ private Schema schema;
@GuardedBy("lock")
private Mappings mappings = new Mappings();
@@ -129,15 +129,15 @@
boolean shared = true;
try
{
- Schema currentSchema = serverContext.getSchemaNG();
- if (schemaNG != currentSchema)
+ Schema currentSchema = serverContext.getSchema();
+ if (schema != currentSchema)
{
sharedLock.unlock();
exclusiveLock.lock();
shared = false;
- currentSchema = serverContext.getSchemaNG();
- if (schemaNG != currentSchema)
+ currentSchema = serverContext.getSchema();
+ if (schema != currentSchema)
{
// build new maps from existing ones
Mappings newMappings = new Mappings(mappings.adEncodeMap.size(), mappings.ocEncodeMap.size());
@@ -145,7 +145,7 @@
reloadObjectClassesMap(mappings, newMappings);
mappings = newMappings;
- schemaNG = currentSchema;
+ schema = currentSchema;
}
}
return mappings;
--
Gitblit v1.10.0