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/tasks/DisconnectClientTask.java | 67 +++++++++++++--------------------
1 files changed, 26 insertions(+), 41 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tasks/DisconnectClientTask.java b/opendj-server-legacy/src/main/java/org/opends/server/tasks/DisconnectClientTask.java
index 7aeee51..f91716b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tasks/DisconnectClientTask.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tasks/DisconnectClientTask.java
@@ -30,8 +30,6 @@
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
-import java.util.List;
-
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.ByteString;
@@ -106,22 +104,18 @@
private long getConnectionID(Entry taskEntry) throws DirectoryException
{
final AttributeType attrType = DirectoryServer.getAttributeTypeOrDefault(ATTR_TASK_DISCONNECT_CONN_ID);
- final List<Attribute> attrList = taskEntry.getAttribute(attrType);
- if (attrList != null)
+ for (Attribute a : taskEntry.getAttribute(attrType))
{
- for (Attribute a : attrList)
+ for (ByteString v : a)
{
- for (ByteString v : a)
+ try
{
- try
- {
- return Long.parseLong(v.toString());
- }
- catch (Exception e)
- {
- LocalizableMessage message = ERR_TASK_DISCONNECT_INVALID_CONN_ID.get(v);
- throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message, e);
- }
+ return Long.parseLong(v.toString());
+ }
+ catch (Exception e)
+ {
+ LocalizableMessage message = ERR_TASK_DISCONNECT_INVALID_CONN_ID.get(v);
+ throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message, e);
}
}
}
@@ -131,27 +125,23 @@
private boolean mustNotifyClient(Entry taskEntry) throws DirectoryException
{
final AttributeType attrType = DirectoryServer.getAttributeTypeOrDefault(ATTR_TASK_DISCONNECT_NOTIFY_CLIENT);
- final List<Attribute> attrList = taskEntry.getAttribute(attrType);
- if (attrList != null)
+ for (Attribute a : taskEntry.getAttribute(attrType))
{
- for (Attribute a : attrList)
+ for (ByteString v : a)
{
- for (ByteString v : a)
+ final String stringValue = toLowerCase(v.toString());
+ if ("true".equals(stringValue))
{
- final String stringValue = toLowerCase(v.toString());
- if ("true".equals(stringValue))
- {
- return true;
- }
- else if ("false".equals(stringValue))
- {
- return false;
- }
- else
- {
- LocalizableMessage message = ERR_TASK_DISCONNECT_INVALID_NOTIFY_CLIENT.get(stringValue);
- throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
- }
+ return true;
+ }
+ else if ("false".equals(stringValue))
+ {
+ return false;
+ }
+ else
+ {
+ LocalizableMessage message = ERR_TASK_DISCONNECT_INVALID_NOTIFY_CLIENT.get(stringValue);
+ throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
}
}
}
@@ -161,21 +151,16 @@
private LocalizableMessage getDisconnectMessage(Entry taskEntry)
{
AttributeType attrType = DirectoryServer.getAttributeTypeOrDefault(ATTR_TASK_DISCONNECT_MESSAGE);
- List<Attribute> attrList = taskEntry.getAttribute(attrType);
- if (attrList != null)
+ for (Attribute a : taskEntry.getAttribute(attrType))
{
- for (Attribute a : attrList)
+ for (ByteString v : a)
{
- for (ByteString v : a)
- {
- return LocalizableMessage.raw(v.toString());
- }
+ return LocalizableMessage.raw(v.toString());
}
}
return INFO_TASK_DISCONNECT_GENERIC_MESSAGE.get();
}
- /** {@inheritDoc} */
@Override
protected TaskState runTask()
{
--
Gitblit v1.10.0