From 14f94c13789b8ace4eae258b5f1d64494518f9c3 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 21 Dec 2015 14:04:12 +0000
Subject: [PATCH] Remove null checks on returned values of Entry.get*Attribute*() methods.
---
opendj-server-legacy/src/main/java/org/opends/server/extensions/StaticGroup.java | 32 +++++++++++++-------------------
1 files changed, 13 insertions(+), 19 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/StaticGroup.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/StaticGroup.java
index cffd849..404610b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/StaticGroup.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/StaticGroup.java
@@ -64,12 +64,12 @@
import org.opends.server.types.Modification;
import org.opends.server.types.SearchFilter;
+import static org.forgerock.util.Reject.*;
import static org.opends.messages.ExtensionMessages.*;
import static org.opends.server.core.DirectoryServer.*;
import static org.opends.server.protocols.internal.InternalClientConnection.*;
import static org.opends.server.util.CollectionUtils.*;
import static org.opends.server.util.ServerConstants.*;
-import static org.forgerock.util.Reject.*;
/**
* A static group implementation, in which the DNs of all members are explicitly
@@ -198,30 +198,24 @@
List<Attribute> memberAttrList = groupEntry.getAttribute(someMemberAttributeType);
int membersCount = 0;
- if (memberAttrList != null)
+ for (Attribute a : memberAttrList)
{
- for (Attribute a : memberAttrList)
- {
- membersCount += a.size();
- }
+ membersCount += a.size();
}
LinkedHashSet<CompactDn> someMemberDNs = new LinkedHashSet<>(membersCount);
- if (memberAttrList != null)
+ for (Attribute a : memberAttrList)
{
- for (Attribute a : memberAttrList)
+ for (ByteString v : a)
{
- for (ByteString v : a)
+ try
{
- try
- {
- someMemberDNs.add(org.forgerock.opendj.ldap.DN.valueOf(v.toString()).compact());
- }
- catch (LocalizedIllegalArgumentException e)
- {
- logger.traceException(e);
- logger.error(ERR_STATICGROUP_CANNOT_DECODE_MEMBER_VALUE_AS_DN, v,
- someMemberAttributeType.getNameOrOID(), groupEntry.getName(), e.getMessageObject());
- }
+ someMemberDNs.add(org.forgerock.opendj.ldap.DN.valueOf(v.toString()).compact());
+ }
+ catch (LocalizedIllegalArgumentException e)
+ {
+ logger.traceException(e);
+ logger.error(ERR_STATICGROUP_CANNOT_DECODE_MEMBER_VALUE_AS_DN,
+ v, someMemberAttributeType.getNameOrOID(), groupEntry.getName(), e.getMessageObject());
}
}
}
--
Gitblit v1.10.0