From 7f02c0c87a295386b0321e13f732394f6716cbd1 Mon Sep 17 00:00:00 2001
From: Fabio Pistolesi <fabio.pistolesi@forgerock.com>
Date: Mon, 18 May 2015 11:44:30 +0000
Subject: [PATCH] OPENDJ-1945 CR-6960 NPE while monitoring a CTS topology

---
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/monitors/DatabaseEnvironmentMonitor.java |    5 ++---
 1 files changed, 2 insertions(+), 3 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 b138a23..3ada35d 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
@@ -212,6 +212,7 @@
     EnvironmentStats environmentStats = null;
     TransactionStats transactionStats = null;
     StatsConfig statsConfig = new StatsConfig();
+    ArrayList<Attribute> monitorAttrs = new ArrayList<Attribute>();
 
     try
     {
@@ -221,11 +222,9 @@
     } catch (DatabaseException e)
     {
       logger.traceException(e);
-      return null;
+      return monitorAttrs;
     }
 
-    ArrayList<Attribute> monitorAttrs = new ArrayList<Attribute>();
-
     String jeVersion = JEVersion.CURRENT_VERSION.getVersionString();
     AttributeType versionType =
          DirectoryServer.getDefaultAttributeType("JEVersion");

--
Gitblit v1.10.0