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/tools/tasks/TaskEntry.java | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskEntry.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskEntry.java
index c9b9ca4..6e2e119 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskEntry.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskEntry.java
@@ -431,7 +431,7 @@
private String getSingleStringValue(Entry entry, String attrName) {
List<Attribute> attrList = entry.getAttribute(attrName);
- if (attrList != null && attrList.size() == 1) {
+ if (attrList.size() == 1) {
Attribute attr = attrList.get(0);
if (!attr.isEmpty()) {
return attr.iterator().next().toString();
@@ -442,12 +442,9 @@
private List<String> getMultiStringValue(Entry entry, String attrName) {
List<String> valuesList = new ArrayList<>();
- List<Attribute> attrList = entry.getAttribute(attrName);
- if (attrList != null) {
- for (Attribute attr : attrList) {
- for (ByteString value : attr) {
- valuesList.add(value.toString());
- }
+ for (Attribute attr : entry.getAttribute(attrName)) {
+ for (ByteString value : attr) {
+ valuesList.add(value.toString());
}
}
return valuesList;
--
Gitblit v1.10.0