From ba663b53d933130d2b6a68c1644e5744428dd1d6 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 25 Nov 2016 11:41:50 +0000
Subject: [PATCH] Manual fixes/changes post inlining DirectoryServer.getSchema()
---
opendj-server-legacy/src/test/java/org/opends/server/replication/GenerationIdTest.java | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/GenerationIdTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/GenerationIdTest.java
index f8b1878..7a824c8 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/GenerationIdTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/GenerationIdTest.java
@@ -35,7 +35,6 @@
import org.forgerock.opendj.ldap.AttributeDescription;
import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.ldap.ResultCode;
-import org.forgerock.opendj.ldap.schema.AttributeType;
import org.opends.server.TestCaseUtils;
import org.opends.server.backends.MemoryBackend;
import org.opends.server.core.DirectoryServer;
@@ -466,8 +465,7 @@
{
debugInfo("Entry found <" + baseDN + ">");
- AttributeType synchronizationGenIDType = DirectoryServer.getInstance().getServerContext().getSchema().getAttributeType(REPLICATION_GENERATION_ID);
- Attribute attr = resultEntry.getAttribute(AttributeDescription.create(synchronizationGenIDType));
+ Attribute attr = resultEntry.getAttribute(AttributeDescription.valueOf(REPLICATION_GENERATION_ID));
return Long.valueOf(attr.iterator().next().toString());
}
return -1;
@@ -491,8 +489,8 @@
LDIFImportConfig importConfig = new LDIFImportConfig(ldifFile.getAbsolutePath());
MemoryBackend memoryBackend =
- (MemoryBackend) TestCaseUtils.getServerContext().getBackendConfigManager().getLocalBackendById(TEST_BACKEND_ID);
- memoryBackend.importLDIF(importConfig, DirectoryServer.getInstance().getServerContext());
+ (MemoryBackend) getServerContext().getBackendConfigManager().getLocalBackendById(TEST_BACKEND_ID);
+ memoryBackend.importLDIF(importConfig, getServerContext());
}
private String createEntry(UUID uid)
--
Gitblit v1.10.0