From 80a3f6364ea92609b94c48593090de26394dc8b7 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 16 Aug 2016 09:03:18 +0000
Subject: [PATCH] OPENDJ-3255 Hit NPE when choose Entry Cache in control-panel
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ServerDescriptor.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ServerDescriptor.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ServerDescriptor.java
index 9672920..006b93c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ServerDescriptor.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ServerDescriptor.java
@@ -16,6 +16,7 @@
*/
package org.opends.guitools.controlpanel.datamodel;
+import static org.opends.admin.ads.util.ConnectionUtils.*;
import static org.opends.guitools.controlpanel.datamodel.BasicMonitoringAttributes.*;
import static org.opends.server.util.SchemaUtils.*;
@@ -508,7 +509,7 @@
{
return false;
}
- String os = sr.getAttribute("operatingSystem").firstValueAsString();
+ String os = firstValueAsString(sr, "operatingSystem");
return os != null && OperatingSystem.WINDOWS.equals(OperatingSystem.forName(os));
}
@@ -692,8 +693,8 @@
{
try
{
- String start = rootMonitor.getAttribute(START_DATE.getAttributeName()).firstValueAsString();
- String current = rootMonitor.getAttribute(CURRENT_DATE.getAttributeName()).firstValueAsString();
+ String start = firstValueAsString(rootMonitor, START_DATE.getAttributeName());
+ String current = firstValueAsString(rootMonitor, CURRENT_DATE.getAttributeName());
Date startTime = ConfigFromConnection.utcParser.parse(start);
Date currentTime = ConfigFromConnection.utcParser.parse(current);
return currentTime.getTime() - startTime.getTime();
--
Gitblit v1.10.0