From f5a956ac0f445f81fa06ed1875253dec8e306f1a Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 12 Jul 2013 12:12:39 +0000
Subject: [PATCH] AciEvalContext.java, AciContainer.java: Removed instance member isDenyEval, setDecidingAci() and setEvalReason(), replaced with setEvaluationResult() since both are always set at the same time. Changed the impl of isDenyEval() to use the evalReason.
---
opends/src/server/org/opends/server/authorization/dseecompat/AciContainer.java | 38 +++++++++-----------------------------
1 files changed, 9 insertions(+), 29 deletions(-)
diff --git a/opends/src/server/org/opends/server/authorization/dseecompat/AciContainer.java b/opends/src/server/org/opends/server/authorization/dseecompat/AciContainer.java
index 3e0b68d..786a948 100644
--- a/opends/src/server/org/opends/server/authorization/dseecompat/AciContainer.java
+++ b/opends/src/server/org/opends/server/authorization/dseecompat/AciContainer.java
@@ -82,11 +82,6 @@
private boolean isEntryTestRule = false;
/**
- * True if the evaluation of an ACI is from the deny list.
- */
- private boolean isDenyEval;
-
- /**
* True if the evaluation is a result of an LDAP add operation.
*/
private boolean isAddOp=false;
@@ -477,27 +472,19 @@
* {@inheritDoc}
*/
@Override
- public void setDecidingAci(Aci aci) {
- this.decidingAci=aci;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
public String getDecidingAciName() {
if(this.decidingAci != null)
return this.decidingAci.getName();
else return null;
}
- /**
- * {@inheritDoc}
- */
- @Override
- public void setEvalReason(EnumEvalReason reason) {
- this.evalReason=reason;
- }
+ /** {@inheritDoc} */
+ @Override
+ public void setEvaluationResult(EnumEvalReason reason, Aci decidingAci)
+ {
+ this.evalReason = reason;
+ this.decidingAci = decidingAci;
+ }
/**
* {@inheritDoc}
@@ -665,7 +652,8 @@
*/
@Override
public boolean isDenyEval() {
- return isDenyEval;
+ return EnumEvalReason.NO_ALLOW_ACIS.equals(evalReason)
+ || EnumEvalReason.EVALUATED_DENY_ACI.equals(evalReason);
}
/**
@@ -680,14 +668,6 @@
* {@inheritDoc}
*/
@Override
- public void setDenyEval(boolean val) {
- isDenyEval = val;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
public DN getClientDN() {
if(this.useAuthzid)
return this.authzid;
--
Gitblit v1.10.0