From 5cd7bdbbda0fa9f1aa6e12d9171c3811b73feb07 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 09 Jul 2015 14:01:31 +0000
Subject: [PATCH] Code cleanup

---
 opendj-server-legacy/src/main/java/org/opends/server/util/StaticUtils.java |   16 +++++++---------
 1 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/server/util/StaticUtils.java b/opendj-server-legacy/src/main/java/org/opends/server/util/StaticUtils.java
index cb3879c..39a1d86 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/util/StaticUtils.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/util/StaticUtils.java
@@ -3711,20 +3711,18 @@
       AttributeType attrType, String attrName, ByteString attrValue)
   {
     List<Attribute> attrList = attrs.get(attrType);
-    if ((attrList == null) || attrList.isEmpty())
-    {
-      AttributeBuilder builder = new AttributeBuilder(attrType, attrName);
-      builder.add(attrValue);
-      attrList = new ArrayList<>(1);
-      attrList.add(builder.toAttribute());
-      attrs.put(attrType, attrList);
-    }
-    else
+    if (attrList != null && !attrList.isEmpty())
     {
       AttributeBuilder builder = new AttributeBuilder(attrList.get(0));
       builder.add(attrValue);
       attrList.set(0, builder.toAttribute());
     }
+    else
+    {
+      AttributeBuilder builder = new AttributeBuilder(attrType, attrName);
+      builder.add(attrValue);
+      attrs.put(attrType, builder.toAttributeList());
+    }
   }
 
   /**

--
Gitblit v1.10.0