From d24466b6b4f1052f07fe4565b1f6a922c637cb79 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 15 Oct 2014 15:39:36 +0000
Subject: [PATCH] Converted opendj3 code to use SearchRequest like API
---
opendj3-server-dev/src/server/org/opends/server/config/JMXMBean.java | 18 ++++++------------
1 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/config/JMXMBean.java b/opendj3-server-dev/src/server/org/opends/server/config/JMXMBean.java
index a2a709d..bbb3cbe 100644
--- a/opendj3-server-dev/src/server/org/opends/server/config/JMXMBean.java
+++ b/opendj3-server-dev/src/server/org/opends/server/config/JMXMBean.java
@@ -64,7 +64,6 @@
import org.opends.server.protocols.internal.SearchRequest;
import org.opends.server.protocols.jmx.Credential;
import org.opends.server.protocols.jmx.JmxClientConnection;
-import org.opends.server.protocols.ldap.LDAPFilter;
import org.opends.server.types.AttributeType;
import org.opends.server.types.DN;
import org.opends.server.types.DirectoryException;
@@ -481,14 +480,12 @@
// Perform the Ldap operation for
// - ACI Check
// - Loggin purpose
- InternalSearchOperation op=null;
+ SearchRequest request = newSearchRequest(configEntryDN, SearchScope.BASE_OBJECT);
+ InternalSearchOperation op = null;
if (clientConnection instanceof JmxClientConnection) {
- op = ((JmxClientConnection)clientConnection).processSearch(
- ByteString.valueOf(configEntryDN.toString()),
- SearchScope.BASE_OBJECT, LDAPFilter.objectClassPresent());
+ op = ((JmxClientConnection) clientConnection).processSearch(request);
}
else if (clientConnection instanceof InternalClientConnection) {
- SearchRequest request = newSearchRequest(configEntryDN, SearchScope.BASE_OBJECT);
op = ((InternalClientConnection) clientConnection).processSearch(request);
}
// BUG : op may be null
@@ -545,8 +542,7 @@
*/
@Override
public AttributeList getAttributes(String[] attributes)
- {
-
+ {
//
// Get the jmx Client connection
ClientConnection clientConnection = getClientConnection();
@@ -559,14 +555,12 @@
// Perform the Ldap operation for
// - ACI Check
// - Loggin purpose
+ SearchRequest request = newSearchRequest(configEntryDN, SearchScope.BASE_OBJECT);
InternalSearchOperation op = null;
if (clientConnection instanceof JmxClientConnection) {
- op = ((JmxClientConnection)clientConnection).processSearch(
- ByteString.valueOf(configEntryDN.toString()),
- SearchScope.BASE_OBJECT, LDAPFilter.objectClassPresent());
+ op = ((JmxClientConnection) clientConnection).processSearch(request);
}
else if (clientConnection instanceof InternalClientConnection) {
- SearchRequest request = newSearchRequest(configEntryDN, SearchScope.BASE_OBJECT);
op = ((InternalClientConnection) clientConnection).processSearch(request);
}
--
Gitblit v1.10.0