OPENDJ-1945 CR-6960 NPE while monitoring a CTS topology

Fabio Pistolesi

18.44.2015 7f02c0c87a295386b0321e13f732394f6716cbd1

OPENDJ-1945 CR-6960 NPE while monitoring a CTS topology

One of the monitors returns a null list instead of an empty list.

 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");