From 3d2247dc6913a8ab1fd570e6db4c38a3f6460039 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 29 Jan 2015 10:33:47 +0000
Subject: [PATCH] AutoRefactor'ed code cleanups
---
opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AuthRate.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AuthRate.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AuthRate.java
index 244a954..f901442 100644
--- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AuthRate.java
+++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AuthRate.java
@@ -148,11 +148,12 @@
Promise<BindResult, LdapException> returnedPromise;
if (filter != null && baseDN != null) {
if (sr == null) {
- if (dataSources == null) {
- sr = Requests.newSearchRequest(baseDN, scope, filter, attributes);
+ if (dataSources != null) {
+ final String newBaseDN = String.format(baseDN, data);
+ final String newFilter = String.format(filter, data);
+ sr = Requests.newSearchRequest(newBaseDN, scope, newFilter, attributes);
} else {
- sr = Requests.newSearchRequest(String.format(baseDN, data), scope,
- String.format(filter, data), attributes);
+ sr = Requests.newSearchRequest(baseDN, scope, filter, attributes);
}
sr.setDereferenceAliasesPolicy(dereferencesAliasesPolicy);
} else if (dataSources != null) {
--
Gitblit v1.10.0