From 8ca638034127ea5c5911ebcd13ff33e742e06784 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 04 Aug 2016 13:23:02 +0000
Subject: [PATCH] Partial OPENDJ-2625 Convert all code that uses JNDI to use the SDK instead
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/TableViewEntryPanel.java | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/TableViewEntryPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/TableViewEntryPanel.java
index 154eff0..f20f367 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/TableViewEntryPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/TableViewEntryPanel.java
@@ -590,7 +590,7 @@
requiredAttrs.clear();
List<String> addedAttrs = new ArrayList<>();
Schema schema = getInfo().getServerDescriptor().getSchema();
- List<Object> ocs = null;
+ List<ByteString> ocs = null;
for (String attrName : searchResult.getAttributeNames())
{
if (ServerConstants.OBJECTCLASS_ATTRIBUTE_TYPE_NAME.equalsIgnoreCase(attrName))
@@ -598,8 +598,7 @@
if (schema != null)
{
ocs = searchResult.getAttributeValues(attrName);
- ObjectClassValue ocValue = getObjectClassDescriptor(
- ocs, schema);
+ ObjectClassValue ocValue = getObjectClassDescriptor(ocs, schema);
allSortedValues.add(new AttributeValuePair(attrName, ocValue));
}
}
@@ -615,9 +614,9 @@
}
if (ocs != null && schema != null)
{
- for (Object oc : ocs)
+ for (ByteString oc : ocs)
{
- ObjectClass objectClass = schema.getObjectClass((String) oc);
+ ObjectClass objectClass = schema.getObjectClass(oc.toString());
if (!objectClass.isPlaceHolder())
{
for (AttributeType attr : objectClass.getRequiredAttributes())
@@ -717,12 +716,11 @@
private void updateObjectClass(ObjectClassValue newValue)
{
CustomSearchResult oldResult = searchResult;
- CustomSearchResult newResult =
- new CustomSearchResult(searchResult.getDN());
+ CustomSearchResult newResult = new CustomSearchResult(searchResult.getDN());
for (String attrName : schemaReadOnlyAttributesLowerCase)
{
- List<Object> values = searchResult.getAttributeValues(attrName);
+ List<ByteString> values = searchResult.getAttributeValues(attrName);
if (!values.isEmpty())
{
newResult.set(attrName, values);
--
Gitblit v1.10.0