From a41662c1136b2bb4a4198df89e0e87d2be3ef099 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 16 Jul 2015 14:57:56 +0000
Subject: [PATCH] AutoRefactor'ed simplify expressions
---
opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciTargets.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciTargets.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciTargets.java
index f2b86ee..2cb9426 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciTargets.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciTargets.java
@@ -548,7 +548,7 @@
public static boolean skipRightsHasRights(int rights) {
//geteffectiverights sets this flag, turn it off before evaluating.
int tmpRights=rights & ~ACI_SKIP_PROXY_CHECK;
- return ((skipRights & tmpRights) == tmpRights);
+ return (skipRights & tmpRights) == tmpRights;
}
@@ -593,8 +593,7 @@
* contains a simple target DN and a equality operator, that
* simple target DN is used as the target DN.
*/
- if((targets.getTarget() != null) &&
- (!targets.getTarget().isPattern())) {
+ if(targets.getTarget() != null && !targets.getTarget().isPattern()) {
EnumTargetOperator op=targets.getTarget().getOperator();
if(op != EnumTargetOperator.NOT_EQUALITY)
{
@@ -628,7 +627,7 @@
}
break;
case SUBORDINATES:
- if ((entryDN.size() <= targetDN.size()) ||
+ if (entryDN.size() <= targetDN.size() ||
!entryDN.isDescendantOf(targetDN)) {
return false;
}
@@ -641,8 +640,8 @@
* against the entry containing the ACI. If operator is inequality,
* check that it doesn't match the target DN.
*/
- if((targets.getTarget() != null) &&
- (!targets.getTarget().isPattern())) {
+ if(targets.getTarget() != null &&
+ !targets.getTarget().isPattern()) {
EnumTargetOperator op=targets.getTarget().getOperator();
if(op == EnumTargetOperator.NOT_EQUALITY) {
DN tmpDN=targets.getTarget().getDN();
@@ -657,8 +656,8 @@
* created when the ACI was decoded. If inequality flip the
* result.
*/
- if((targets.getTarget() != null) &&
- (targets.getTarget().isPattern())) {
+ if(targets.getTarget() != null &&
+ targets.getTarget().isPattern()) {
final boolean ret = targets.getTarget().matchesPattern(entryDN);
EnumTargetOperator op=targets.getTarget().getOperator();
if(op == EnumTargetOperator.NOT_EQUALITY)
--
Gitblit v1.10.0