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/main/java/org/opends/server/tools/ImportLDIF.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/ImportLDIF.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/ImportLDIF.java
index 3b034fb..79a911f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/ImportLDIF.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/ImportLDIF.java
@@ -36,6 +36,7 @@
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.ldap.schema.AttributeType;
+import org.forgerock.opendj.ldap.schema.Schema;
import org.forgerock.opendj.server.config.server.BackendCfg;
import org.opends.server.api.LocalBackend;
import org.opends.server.api.LocalBackend.BackendOperation;
@@ -474,6 +475,7 @@
HashSet<AttributeType> excludeAttributes;
boolean excludeAllUserAttributes = false;
boolean excludeAllOperationalAttributes = false;
+ Schema schema = DirectoryServer.getInstance().getServerContext().getSchema();
if (excludeAttributeStrings == null)
{
excludeAttributes = null;
@@ -494,7 +496,7 @@
}
else
{
- excludeAttributes.add(DirectoryServer.getInstance().getServerContext().getSchema().getAttributeType(attrName));
+ excludeAttributes.add(schema.getAttributeType(attrName));
}
}
}
@@ -522,7 +524,7 @@
}
else
{
- includeAttributes.add(DirectoryServer.getInstance().getServerContext().getSchema().getAttributeType(attrName));
+ includeAttributes.add(schema.getAttributeType(attrName));
}
}
}
--
Gitblit v1.10.0