From 23de2bc1524fe169fcca2c4a39201db78f6c6b9a Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 21 Dec 2015 14:04:11 +0000
Subject: [PATCH] Entry.getAttributes() never return null
---
opendj-server-legacy/src/main/java/org/forgerock/opendj/adapter/server3x/Converters.java | 20 ++++++--------------
1 files changed, 6 insertions(+), 14 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/forgerock/opendj/adapter/server3x/Converters.java b/opendj-server-legacy/src/main/java/org/forgerock/opendj/adapter/server3x/Converters.java
index 1f48829..44a7f1e 100644
--- a/opendj-server-legacy/src/main/java/org/forgerock/opendj/adapter/server3x/Converters.java
+++ b/opendj-server-legacy/src/main/java/org/forgerock/opendj/adapter/server3x/Converters.java
@@ -560,18 +560,12 @@
final SearchResultEntry searchResultEntry =
Responses.newSearchResultEntry(srvResultEntry.getName().toString());
- if (srvResultEntry.getAttributes() != null) {
- for (org.opends.server.types.Attribute a : srvResultEntry.getAttributes()) {
- searchResultEntry.addAttribute(from(a));
- }
+ for (org.opends.server.types.Attribute a : srvResultEntry.getAttributes()) {
+ searchResultEntry.addAttribute(from(a));
}
-
- if (srvResultEntry.getControls() != null) {
- for (org.opends.server.types.Control c : srvResultEntry.getControls()) {
- searchResultEntry.addControl(from(c));
- }
+ for (org.opends.server.types.Control c : srvResultEntry.getControls()) {
+ searchResultEntry.addControl(from(c));
}
-
return searchResultEntry;
}
@@ -588,10 +582,8 @@
final org.opends.server.types.Entry srvResultEntry) {
final org.forgerock.opendj.ldap.Entry entry = new LinkedHashMapEntry(srvResultEntry.getName().toString());
- if (srvResultEntry.getAttributes() != null) {
- for (org.opends.server.types.Attribute a : srvResultEntry.getAttributes()) {
- entry.addAttribute(from(a));
- }
+ for (org.opends.server.types.Attribute a : srvResultEntry.getAttributes()) {
+ entry.addAttribute(from(a));
}
return entry;
}
--
Gitblit v1.10.0