From 6b41484b811fdb343e6dcccb8dddfa223800a138 Mon Sep 17 00:00:00 2001
From: Yannick Lecaillez <yannick.lecaillez@forgerock.com>
Date: Tue, 19 May 2015 13:32:55 +0000
Subject: [PATCH] Minor cleanup (use diamond & interface)
---
opendj-server-legacy/src/main/java/org/opends/server/extensions/DefaultEntryCache.java | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/DefaultEntryCache.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/DefaultEntryCache.java
index c992138..ee9079d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/DefaultEntryCache.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/DefaultEntryCache.java
@@ -26,7 +26,7 @@
*/
package org.opends.server.extensions;
-import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import java.util.SortedMap;
@@ -289,10 +289,8 @@
/** {@inheritDoc} */
@Override
- public ArrayList<Attribute> getMonitorData()
+ public List<Attribute> getMonitorData()
{
- ArrayList<Attribute> attrs = new ArrayList<Attribute>();
-
// The sum of cache hits of all active entry cache implementations.
long entryCacheHits = 0;
// Common for all active entry cache implementations.
@@ -307,7 +305,7 @@
}
try {
- attrs = EntryCacheCommon.getGenericMonitorData(
+ return EntryCacheCommon.getGenericMonitorData(
entryCacheHits,
entryCacheMisses,
null,
@@ -317,9 +315,8 @@
);
} catch (Exception e) {
logger.traceException(e);
+ return Collections.emptyList();
}
-
- return attrs;
}
/** {@inheritDoc} */
--
Gitblit v1.10.0