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/api/AuthenticationPolicyState.java | 118 +++++++++++++++++++++++++++-------------------------------
1 files changed, 55 insertions(+), 63 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/api/AuthenticationPolicyState.java b/opendj-server-legacy/src/main/java/org/opends/server/api/AuthenticationPolicyState.java
index e52a97f..15e55fb 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/api/AuthenticationPolicyState.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/api/AuthenticationPolicyState.java
@@ -35,7 +35,10 @@
import org.forgerock.opendj.ldap.GeneralizedTime;
import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.types.*;
+import org.opends.server.types.Attribute;
+import org.opends.server.types.AttributeType;
+import org.opends.server.types.DirectoryException;
+import org.opends.server.types.Entry;
import static org.opends.messages.CoreMessages.*;
import static org.opends.server.config.ConfigConstants.*;
@@ -106,53 +109,47 @@
final AttributeType attributeType) throws DirectoryException
{
final List<Attribute> attrList = entry.getAttribute(attributeType);
- if (attrList != null)
+ for (final Attribute a : attrList)
{
- for (final Attribute a : attrList)
+ if (a.isEmpty())
{
- if (a.isEmpty())
- {
- continue;
- }
+ continue;
+ }
- final String valueString = toLowerCase(a.iterator().next().toString());
-
- if (valueString.equals("true") || valueString.equals("yes")
- || valueString.equals("on") || valueString.equals("1"))
- {
- if (logger.isTraceEnabled())
- {
- logger.trace("Attribute %s resolves to true for user entry %s",
- attributeType.getNameOrOID(), entry.getName());
- }
-
- return ConditionResult.TRUE;
- }
-
- if (valueString.equals("false") || valueString.equals("no")
- || valueString.equals("off") || valueString.equals("0"))
- {
- if (logger.isTraceEnabled())
- {
- logger.trace("Attribute %s resolves to false for user entry %s",
- attributeType.getNameOrOID(), entry.getName());
- }
-
- return ConditionResult.FALSE;
- }
-
+ final String valueString = toLowerCase(a.iterator().next().toString());
+ if (valueString.equals("true") || valueString.equals("yes") || valueString.equals("on")
+ || valueString.equals("1"))
+ {
if (logger.isTraceEnabled())
{
- logger.trace("Unable to resolve value %s for attribute %s "
- + "in user entry %s as a Boolean.", valueString,
+ logger
+ .trace("Attribute %s resolves to true for user entry %s", attributeType.getNameOrOID(), entry.getName());
+ }
+
+ return ConditionResult.TRUE;
+ }
+
+ if (valueString.equals("false") || valueString.equals("no") || valueString.equals("off")
+ || valueString.equals("0"))
+ {
+ if (logger.isTraceEnabled())
+ {
+ logger.trace("Attribute %s resolves to false for user entry %s",
attributeType.getNameOrOID(), entry.getName());
}
- final LocalizableMessage message = ERR_PWPSTATE_CANNOT_DECODE_BOOLEAN
- .get(valueString, attributeType.getNameOrOID(), entry.getName());
- throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
- message);
+ return ConditionResult.FALSE;
}
+
+ if (logger.isTraceEnabled())
+ {
+ logger.trace("Unable to resolve value %s for attribute %s " + "in user entry %s as a Boolean.", valueString,
+ attributeType.getNameOrOID(), entry.getName());
+ }
+
+ final LocalizableMessage message =
+ ERR_PWPSTATE_CANNOT_DECODE_BOOLEAN.get(valueString, attributeType.getNameOrOID(), entry.getName());
+ throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
}
if (logger.isTraceEnabled())
@@ -187,33 +184,28 @@
{
long timeValue = -1;
- final List<Attribute> attrList = entry.getAttribute(attributeType);
- if (attrList != null)
+ for (final Attribute a : entry.getAttribute(attributeType))
{
- for (final Attribute a : attrList)
+ if (a.isEmpty())
{
- if (a.isEmpty())
- {
- continue;
- }
-
- final ByteString v = a.iterator().next();
- try
- {
- timeValue = GeneralizedTime.valueOf(v.toString()).getTimeInMillis();
- }
- catch (final Exception e)
- {
- logger.traceException(e, "Unable to decode value %s for attribute %s in user entry %s",
- v, attributeType.getNameOrOID(), entry.getName());
-
- final LocalizableMessage message = ERR_PWPSTATE_CANNOT_DECODE_GENERALIZED_TIME
- .get(v, attributeType.getNameOrOID(), entry.getName(), e);
- throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
- message, e);
- }
- break;
+ continue;
}
+
+ final ByteString v = a.iterator().next();
+ try
+ {
+ timeValue = GeneralizedTime.valueOf(v.toString()).getTimeInMillis();
+ }
+ catch (final Exception e)
+ {
+ logger.traceException(e, "Unable to decode value %s for attribute %s in user entry %s",
+ v, attributeType.getNameOrOID(), entry.getName());
+
+ final LocalizableMessage message = ERR_PWPSTATE_CANNOT_DECODE_GENERALIZED_TIME
+ .get(v, attributeType.getNameOrOID(), entry.getName(), e);
+ throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message, e);
+ }
+ break;
}
if (timeValue == -1 && logger.isTraceEnabled())
--
Gitblit v1.10.0