From 606729888f9fcc49b140afae6a0de5f12f04e800 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 19 May 2015 13:42:27 +0000
Subject: [PATCH] Follow up on r12267.
---
opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/monitors/DatabaseEnvironmentMonitor.java | 16 +++++++---------
1 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/monitors/DatabaseEnvironmentMonitor.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/monitors/DatabaseEnvironmentMonitor.java
index 3ada35d..ea8bd15 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/monitors/DatabaseEnvironmentMonitor.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/monitors/DatabaseEnvironmentMonitor.java
@@ -26,13 +26,13 @@
*/
package org.opends.server.monitors;
-
-
import java.lang.reflect.Method;
import java.util.*;
import java.util.concurrent.atomic.AtomicInteger;
import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.admin.std.server.MonitorProviderCfg;
import org.opends.server.api.AttributeSyntax;
import org.opends.server.api.MonitorProvider;
@@ -40,17 +40,15 @@
import org.opends.server.backends.jeb.EntryContainer;
import org.opends.server.backends.jeb.Index;
import org.opends.server.backends.jeb.RootContainer;
-import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
-import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
+import org.opends.server.util.TimeThread;
+
import com.sleepycat.je.DatabaseException;
import com.sleepycat.je.EnvironmentStats;
import com.sleepycat.je.JEVersion;
import com.sleepycat.je.StatsConfig;
import com.sleepycat.je.TransactionStats;
-import org.opends.server.util.TimeThread;
-
/**
* A monitor provider for a Berkeley DB JE environment.
@@ -207,12 +205,11 @@
* returned to the client if the corresponding monitor entry is
* requested.
*/
- public ArrayList<Attribute> getMonitorData()
+ public List<Attribute> getMonitorData()
{
EnvironmentStats environmentStats = null;
TransactionStats transactionStats = null;
StatsConfig statsConfig = new StatsConfig();
- ArrayList<Attribute> monitorAttrs = new ArrayList<Attribute>();
try
{
@@ -222,9 +219,10 @@
} catch (DatabaseException e)
{
logger.traceException(e);
- return monitorAttrs;
+ return Collections.emptyList();
}
+ ArrayList<Attribute> monitorAttrs = new ArrayList<Attribute>();
String jeVersion = JEVersion.CURRENT_VERSION.getVersionString();
AttributeType versionType =
DirectoryServer.getDefaultAttributeType("JEVersion");
--
Gitblit v1.10.0