From 62b134351917387ee30ed318f06f0dae766e8b31 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 15 Oct 2014 14:43:02 +0000
Subject: [PATCH] (CR-4811) Converted opendj3 code to use SearchRequest like API
---
opendj3-server-dev/src/server/org/opends/server/config/JMXMBean.java | 32 +++++---------------------------
1 files changed, 5 insertions(+), 27 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 cb16e87..a2a709d 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
@@ -69,7 +69,6 @@
import org.opends.server.types.DN;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.InvokableMethod;
-import org.opends.server.types.LDAPException;
import static org.opends.messages.ConfigMessages.*;
import static org.opends.server.protocols.internal.Requests.*;
@@ -486,10 +485,10 @@
if (clientConnection instanceof JmxClientConnection) {
op = ((JmxClientConnection)clientConnection).processSearch(
ByteString.valueOf(configEntryDN.toString()),
- SearchScope.BASE_OBJECT, getTrueFilter());
+ SearchScope.BASE_OBJECT, LDAPFilter.objectClassPresent());
}
else if (clientConnection instanceof InternalClientConnection) {
- SearchRequest request = newSearchRequest(configEntryDN, SearchScope.BASE_OBJECT, "(objectclass=*)");
+ SearchRequest request = newSearchRequest(configEntryDN, SearchScope.BASE_OBJECT);
op = ((InternalClientConnection) clientConnection).processSearch(request);
}
// BUG : op may be null
@@ -516,20 +515,6 @@
}
}
- private LDAPFilter getTrueFilter()
- {
- try
- {
- return LDAPFilter.decode("(objectclass=*)");
- }
- catch (LDAPException e)
- {
- // can never happen
- logger.traceException(e);
- return null;
- }
- }
-
/**
* Set the value of a specific attribute of the Dynamic MBean. In this case,
* it will always throw {@code InvalidAttributeValueException} because setting
@@ -578,18 +563,11 @@
if (clientConnection instanceof JmxClientConnection) {
op = ((JmxClientConnection)clientConnection).processSearch(
ByteString.valueOf(configEntryDN.toString()),
- SearchScope.BASE_OBJECT, getTrueFilter());
+ SearchScope.BASE_OBJECT, LDAPFilter.objectClassPresent());
}
else if (clientConnection instanceof InternalClientConnection) {
- try
- {
- SearchRequest request = newSearchRequest(configEntryDN, SearchScope.BASE_OBJECT, "(objectclass=*)");
- op = ((InternalClientConnection) clientConnection).processSearch(request);
- }
- catch (DirectoryException e)
- {
- logger.traceException(e);
- }
+ SearchRequest request = newSearchRequest(configEntryDN, SearchScope.BASE_OBJECT);
+ op = ((InternalClientConnection) clientConnection).processSearch(request);
}
if (op == null)
--
Gitblit v1.10.0