From 8a180ad417c26429cd3774c0046165c40ad1010a Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 28 Apr 2016 09:04:35 +0000
Subject: [PATCH] LDAPAuthenticationHandler.java: Remove code duplication
---
opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPPasswordModify.java | 47 ++++++++++++++++++++---------------------------
1 files changed, 20 insertions(+), 27 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPPasswordModify.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPPasswordModify.java
index 243f0f8..ba7e6cb 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPPasswordModify.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPPasswordModify.java
@@ -29,7 +29,6 @@
import java.io.OutputStream;
import java.io.PrintStream;
import java.util.ArrayList;
-import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
import org.forgerock.i18n.LocalizableMessage;
@@ -654,38 +653,32 @@
// See if the response included any controls that we recognize, and if so
// then handle them.
- List<Control> responseControls = responseMessage.getControls();
- if (responseControls != null)
+ for (Control c : responseMessage.getControls())
{
- for (Control c : responseControls)
+ if (c.getOID().equals(OID_PASSWORD_POLICY_CONTROL))
{
- if (c.getOID().equals(OID_PASSWORD_POLICY_CONTROL))
+ try
{
- try
- {
- PasswordPolicyResponseControl pwPolicyControl =
- PasswordPolicyResponseControl.DECODER
- .decode(c.isCritical(), ((LDAPControl) c).getValue());
+ PasswordPolicyResponseControl pwPolicyControl =
+ PasswordPolicyResponseControl.DECODER
+ .decode(c.isCritical(), ((LDAPControl) c).getValue());
- PasswordPolicyWarningType pwPolicyWarningType =
- pwPolicyControl.getWarningType();
- if (pwPolicyWarningType != null)
- {
- printWrappedText(
- out, INFO_LDAPPWMOD_PWPOLICY_WARNING.get(pwPolicyWarningType, pwPolicyControl.getWarningValue()));
- }
-
- PasswordPolicyErrorType pwPolicyErrorType =
- pwPolicyControl.getErrorType();
- if (pwPolicyErrorType != null)
- {
- printWrappedText(out, INFO_LDAPPWMOD_PWPOLICY_ERROR.get(pwPolicyErrorType));
- }
- }
- catch (Exception e)
+ PasswordPolicyWarningType pwPolicyWarningType = pwPolicyControl.getWarningType();
+ if (pwPolicyWarningType != null)
{
- printWrappedText(err, ERR_LDAPPWMOD_CANNOT_DECODE_PWPOLICY_CONTROL.get(e));
+ printWrappedText(
+ out, INFO_LDAPPWMOD_PWPOLICY_WARNING.get(pwPolicyWarningType, pwPolicyControl.getWarningValue()));
}
+
+ PasswordPolicyErrorType pwPolicyErrorType = pwPolicyControl.getErrorType();
+ if (pwPolicyErrorType != null)
+ {
+ printWrappedText(out, INFO_LDAPPWMOD_PWPOLICY_ERROR.get(pwPolicyErrorType));
+ }
+ }
+ catch (Exception e)
+ {
+ printWrappedText(err, ERR_LDAPPWMOD_CANNOT_DECODE_PWPOLICY_CONTROL.get(e));
}
}
}
--
Gitblit v1.10.0