From cce0ebbc8595a0efa7f57c65c67998150f95baf6 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 13 Oct 2015 07:40:53 +0000
Subject: [PATCH] LocalBackendModifyOperation.java: Extracted method isAuthnManagedLocally()
---
opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendModifyOperation.java | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendModifyOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendModifyOperation.java
index 2e360c7..f27d0d4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendModifyOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendModifyOperation.java
@@ -184,7 +184,14 @@
LocalBackendWorkflowElement.attachLocalOperation (modify, this);
}
-
+ /**
+ * Returns whether authentication for this user is managed locally
+ * or via Pass-Through Authentication.
+ */
+ private boolean isAuthnManagedLocally()
+ {
+ return pwPolicyState != null;
+ }
/**
* Retrieves the current entry before any modifications are applied. This
@@ -819,9 +826,9 @@
isEnabled = true;
enabledStateChanged = false;
- if (pwPolicyState == null)
+ if (!isAuthnManagedLocally())
{
- // Account not managed locally so nothing to do.
+ // nothing to do.
return;
}
@@ -1560,8 +1567,7 @@
public void performAdditionalPasswordChangedProcessing()
throws DirectoryException
{
- if (!passwordChanged
- || pwPolicyState == null) // Account not managed locally
+ if (!isAuthnManagedLocally() || !passwordChanged)
{
// Nothing to do.
return;
@@ -1673,15 +1679,9 @@
*/
private void handleAccountStatusNotifications()
{
- if (pwPolicyState == null)
+ if (!isAuthnManagedLocally())
{
- // Account not managed locally, so nothing to do.
- return;
- }
-
- if (!passwordChanged && !enabledStateChanged && !wasLocked)
- {
- // Account managed locally, but unchanged, so nothing to do.
+ // nothing to do.
return;
}
--
Gitblit v1.10.0