From a3c93828f847345ed67fda0cddf1089d8fb433d5 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 07 Mar 2016 15:04:03 +0000
Subject: [PATCH] OPENDJ-1342 Migrate AVA, RDN, and DN classes: DirectoryException => LocalizedIllegalArgumentException
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ResetUserPasswordTask.java | 25 ++++++++-----------------
1 files changed, 8 insertions(+), 17 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ResetUserPasswordTask.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ResetUserPasswordTask.java
index e7db79d..0f6e240 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ResetUserPasswordTask.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ResetUserPasswordTask.java
@@ -43,12 +43,8 @@
import org.opends.server.config.ConfigConstants;
import org.opends.server.tools.LDAPPasswordModify;
import org.forgerock.opendj.ldap.DN;
-import org.opends.server.types.OpenDsException;
-/**
- * The task called when we want to reset the password of the user.
- *
- */
+/** The task called when we want to reset the password of the user. */
public class ResetUserPasswordTask extends Task
{
private Set<String> backendSet;
@@ -74,24 +70,19 @@
backendSet = new HashSet<>();
this.node = node;
this.newPassword = pwd;
- try
+ dn = DN.valueOf(node.getDN());
+
+ for (BackendDescriptor backend : info.getServerDescriptor().getBackends())
{
- dn = DN.valueOf(node.getDN());
- for (BackendDescriptor backend : info.getServerDescriptor().getBackends())
+ for (BaseDNDescriptor baseDN : backend.getBaseDns())
{
- for (BaseDNDescriptor baseDN : backend.getBaseDns())
+ if (dn.isSubordinateOrEqualTo(baseDN.getDn()))
{
- if (dn.isSubordinateOrEqualTo(baseDN.getDn()))
- {
- backendSet.add(backend.getBackendID());
- }
+ backendSet.add(backend.getBackendID());
}
}
}
- catch (OpenDsException ode)
- {
- throw new RuntimeException("Could not parse DN: "+node.getDN(), ode);
- }
+
try
{
InitialLdapContext ctx =
--
Gitblit v1.10.0