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/ManageTasksPanel.java | 17 ++++-------------
1 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ManageTasksPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ManageTasksPanel.java
index 3f2fcd0..d298e1d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ManageTasksPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ManageTasksPanel.java
@@ -506,7 +506,7 @@
};
for (int j=0; j < attrNames.length; j++)
{
- Object o = values[j] + r.nextInt();
+ ByteString o = ByteString.valueOfUtf8(values[j] + r.nextInt());
csr.set(attrNames[j], newArrayList(o));
}
try
@@ -571,7 +571,7 @@
};
for (int j=0; j < attrNames.length; j++)
{
- Object o = values[j];
+ ByteString o = ByteString.valueOfUtf8(values[j]);
csr.set(attrNames[j], newArrayList(o));
}
try
@@ -646,7 +646,7 @@
// corresponding definition and add the value to the appropriate hash.
if (attrType.isObjectClass())
{
- for (Object value : csr.getAttributeValues(attrType.getNameOrOID()))
+ for (ByteString value : csr.getAttributeValues(attrType.getNameOrOID()))
{
String ocName = value.toString().trim();
objectClasses.put(DirectoryServer.getSchema().getObjectClass(ocName), ocName);
@@ -655,17 +655,8 @@
else
{
AttributeBuilder builder = new AttributeBuilder(attrDesc);
- for (Object value : csr.getAttributeValues(attrType.getNameOrOID()))
+ for (ByteString bs : csr.getAttributeValues(attrType.getNameOrOID()))
{
- ByteString bs;
- if (value instanceof byte[])
- {
- bs = ByteString.wrap((byte[])value);
- }
- else
- {
- bs = ByteString.valueOfUtf8(value.toString());
- }
builder.add(bs);
}
--
Gitblit v1.10.0