From 51dfd09ef87970a9ff310170fe5603b18408a837 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 01 Jul 2016 13:56:59 +0000
Subject: [PATCH] Fix NPE in control-panel

---
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/Utilities.java |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/Utilities.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/Utilities.java
index 3275dce..d0b2531 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/Utilities.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/Utilities.java
@@ -2490,12 +2490,14 @@
    */
   public static String getMonitoringValue(MonitoringAttributes attr, SearchResultEntry monitoringEntry)
   {
-    String monitoringValue = monitoringEntry.getAttribute(attr.getAttributeName()).firstValueAsString();
-    if (monitoringValue == null)
+    Attribute monitoringAttr = monitoringEntry.getAttribute(attr.getAttributeName());
+    if (monitoringAttr == null)
     {
       return NO_VALUE_SET.toString();
     }
-    else if (isNotImplemented(attr, monitoringEntry))
+
+    String monitoringValue = monitoringAttr.firstValueAsString();
+    if (isNotImplemented(attr, monitoringEntry))
     {
       return NOT_IMPLEMENTED.toString();
     }

--
Gitblit v1.10.0