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/authorization/dseecompat/AciHandler.java | 34 ++++++++++++----------------------
1 files changed, 12 insertions(+), 22 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciHandler.java
index d945761..1d47a29 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciHandler.java
@@ -717,20 +717,15 @@
&& resourceEntry.hasAttribute(modAttrType))
{
container.setCurrentAttributeType(modAttrType);
- List<Attribute> attrList =
- resourceEntry.getAttribute(modAttrType, modAttr.getOptions());
- if (attrList != null)
+ for (Attribute a : resourceEntry.getAttribute(modAttrType, modAttr.getOptions()))
{
- for (Attribute a : attrList)
+ for (ByteString v : a)
{
- for (ByteString v : a)
+ container.setCurrentAttributeValue(v);
+ container.setRights(ACI_WRITE_DELETE);
+ if (!skipAccessCheck && !accessAllowed(container))
{
- container.setCurrentAttributeValue(v);
- container.setRights(ACI_WRITE_DELETE);
- if (!skipAccessCheck && !accessAllowed(container))
- {
- return false;
- }
+ return false;
}
}
}
@@ -762,20 +757,15 @@
break;
case INCREMENT:
Entry modifiedEntry = operation.getModifiedEntry();
- List<Attribute> modifiedAttrs =
- modifiedEntry.getAttribute(modAttrType, modAttr.getOptions());
- if (modifiedAttrs != null)
+ for (Attribute attr : modifiedEntry.getAttribute(modAttrType, modAttr.getOptions()))
{
- for (Attribute attr : modifiedAttrs)
+ for (ByteString val : attr)
{
- for (ByteString val : attr)
+ container.setCurrentAttributeValue(val);
+ container.setRights(ACI_WRITE_ADD);
+ if (!skipAccessCheck && !accessAllowed(container))
{
- container.setCurrentAttributeValue(val);
- container.setRights(ACI_WRITE_ADD);
- if (!skipAccessCheck && !accessAllowed(container))
- {
- return false;
- }
+ return false;
}
}
}
--
Gitblit v1.10.0