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/backends/task/Task.java | 10 +++-------
1 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/task/Task.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/task/Task.java
index 4132eed..ee72df7 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/task/Task.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/task/Task.java
@@ -312,7 +312,7 @@
throws InitializationException
{
List<Attribute> attrList = taskEntry.getAttribute(attributeName.toLowerCase());
- if (attrList == null || attrList.isEmpty())
+ if (attrList.isEmpty())
{
if (isRequired)
{
@@ -361,7 +361,7 @@
{
LinkedList<String> valueStrings = new LinkedList<>();
List<Attribute> attrList = taskEntry.getAttribute(attributeName.toLowerCase());
- if (attrList == null || attrList.isEmpty())
+ if (attrList.isEmpty())
{
return valueStrings;
}
@@ -848,14 +848,10 @@
final List<Attribute> attrList = taskEntry.getAttribute(type);
ByteString value = ByteString.valueOfUtf8(messageString);
- if (attrList == null)
+ if (attrList.isEmpty())
{
taskEntry.putAttribute(type, newArrayList(Attributes.create(type, value)));
}
- else if (attrList.isEmpty())
- {
- attrList.add(Attributes.create(type, value));
- }
else
{
AttributeBuilder builder = new AttributeBuilder(attrList.get(0));
--
Gitblit v1.10.0