From ea6c8133fa7544dea1209a45512a5f0c464bea24 Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Thu, 29 Mar 2012 14:09:23 +0000
Subject: [PATCH] Followup fix to OPENDJ-441. The hasValue() method needs to ignore subentries (like getValue). This fix resolve the issue with the Nightly build tests failing.
---
opends/src/server/org/opends/server/extensions/PasswordExpirationTimeVirtualAttributeProvider.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/opends/src/server/org/opends/server/extensions/PasswordExpirationTimeVirtualAttributeProvider.java b/opends/src/server/org/opends/server/extensions/PasswordExpirationTimeVirtualAttributeProvider.java
index e817ea4..385b12d 100644
--- a/opends/src/server/org/opends/server/extensions/PasswordExpirationTimeVirtualAttributeProvider.java
+++ b/opends/src/server/org/opends/server/extensions/PasswordExpirationTimeVirtualAttributeProvider.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2012 profiq s.r.o.
+ * Portions Copyright 2012 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -94,7 +95,6 @@
VirtualAttributeRule rule)
{
// Do not process LDAP operational entries.
-
if (!entry.isSubentry() && !entry.isLDAPSubentry())
{
long expirationTime = getPasswordExpirationTime(entry);
@@ -145,7 +145,9 @@
@Override
public boolean hasValue(Entry entry, VirtualAttributeRule rule)
{
- if (getPasswordExpirationTime(entry) == -1)
+ // Do not process LDAP operational entries.
+ if (entry.isSubentry() || entry.isLDAPSubentry()
+ || (getPasswordExpirationTime(entry) == -1))
{
return false;
}
--
Gitblit v1.10.0