From 4a87d0ed96753944d40e2a7bc4fc64f342767649 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 04 Feb 2014 10:49:25 +0000
Subject: [PATCH] Factorized a lot of String joining code into Utils.joinAsString(). Removed unjustified uses of LocalizedMessageBuilder. Removed a few calls to String.valueOf() with arguments of LocalizableMessageBuilder.append().
---
opendj3-server-dev/src/server/org/opends/server/extensions/SoftReferenceEntryCache.java | 24 ++++++------------------
1 files changed, 6 insertions(+), 18 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/SoftReferenceEntryCache.java b/opendj3-server-dev/src/server/org/opends/server/extensions/SoftReferenceEntryCache.java
index f5973ae..bb51355 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/SoftReferenceEntryCache.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/SoftReferenceEntryCache.java
@@ -26,27 +26,24 @@
*/
package org.opends.server.extensions;
-
-
import java.lang.ref.ReferenceQueue;
import java.lang.ref.SoftReference;
import java.util.ArrayList;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
-import org.forgerock.i18n.LocalizableMessage;
-import org.forgerock.i18n.LocalizableMessageBuilder;
+import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.util.Utils;
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.std.server.EntryCacheCfg;
import org.opends.server.admin.std.server.SoftReferenceEntryCacheCfg;
import org.opends.server.api.Backend;
-import org.opends.server.api.EntryCache;
import org.opends.server.api.DirectoryThread;
+import org.opends.server.api.EntryCache;
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
-import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.Attribute;
import org.opends.server.types.CacheEntry;
import org.opends.server.types.ConfigChangeResult;
@@ -58,8 +55,6 @@
import static org.opends.messages.ExtensionMessages.*;
-
-
/**
* This class defines a Directory Server entry cache that uses soft references
* to manage objects in a way that will allow them to be freed if the JVM is
@@ -141,15 +136,7 @@
EntryCacheCommon.ConfigPhase.PHASE_INIT, null, errorMessages
);
if (!processEntryCacheConfig(configuration, applyChanges, errorHandler)) {
- LocalizableMessageBuilder buffer = new LocalizableMessageBuilder();
- if (!errorMessages.isEmpty()) {
- Iterator<LocalizableMessage> iterator = errorMessages.iterator();
- buffer.append(iterator.next());
- while (iterator.hasNext()) {
- buffer.append(". ");
- buffer.append(iterator.next());
- }
- }
+ String buffer = Utils.joinAsString(". ", errorMessages);
throw new ConfigException(ERR_SOFTREFCACHE_CANNOT_INITIALIZE.get(buffer));
}
}
@@ -693,6 +680,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public String toVerboseString()
{
StringBuilder sb = new StringBuilder();
--
Gitblit v1.10.0