From cdbc97a66ca18d9f74b58c3fbca253f17d4dcd55 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 02 Feb 2016 10:57:43 +0000
Subject: [PATCH] Code cleanups: - remove isEmpty() checks when lists are iterated immediately after - extracted methods - removed {@inheritDoc} javadocs
---
opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/UserAttr.java | 34 +++++++++++++---------------------
1 files changed, 13 insertions(+), 21 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/UserAttr.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/UserAttr.java
index 729b2ea..9316bd2 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/UserAttr.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/UserAttr.java
@@ -229,36 +229,28 @@
*/
private EnumEvalResult evalURL(AciEvalContext evalCtx) {
EnumEvalResult matched= EnumEvalResult.FALSE;
- boolean undefined=false;
AttributeType attrType = DirectoryServer.getAttributeType(attrStr);
List<Attribute> attrs=evalCtx.getResourceEntry().getAttribute(attrType);
- if(!attrs.isEmpty()) {
- for(Attribute a : attrs) {
- for(ByteString v : a) {
- LDAPURL url;
- try {
- url = LDAPURL.decode(v.toString(), true);
- } catch (DirectoryException e) {
- break;
- }
- matched=UserDN.evalURL(evalCtx, url);
- if(matched != EnumEvalResult.FALSE)
- {
- break;
- }
- }
- if (matched == EnumEvalResult.TRUE)
- {
+ for(Attribute a : attrs) {
+ for(ByteString v : a) {
+ LDAPURL url;
+ try {
+ url = LDAPURL.decode(v.toString(), true);
+ } catch (DirectoryException e) {
break;
}
- if (matched == EnumEvalResult.ERR)
+ matched=UserDN.evalURL(evalCtx, url);
+ if(matched != EnumEvalResult.FALSE)
{
- undefined=true;
break;
}
}
+ if (matched == EnumEvalResult.TRUE)
+ {
+ break;
+ }
}
- return matched.getRet(type, undefined);
+ return matched.getRet(type, matched == EnumEvalResult.ERR);
}
/**
--
Gitblit v1.10.0