From a632fbfad0ddbe8b343c6abe8e28dc41e3df9b7e Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 10 Jul 2015 10:16:25 +0000
Subject: [PATCH] Code cleanup
---
opendj-server-legacy/src/main/java/org/opends/server/config/JMXMBean.java | 17 +++--------------
1 files changed, 3 insertions(+), 14 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/config/JMXMBean.java b/opendj-server-legacy/src/main/java/org/opends/server/config/JMXMBean.java
index eba058b..61a78bb 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/config/JMXMBean.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/config/JMXMBean.java
@@ -398,14 +398,8 @@
{
// It's possible that this is a monitor attribute rather than a configurable
// one. Check all of those.
- AttributeType attrType =
- DirectoryServer.getAttributeType(name.toLowerCase());
- if (attrType == null)
- {
- attrType = DirectoryServer.getDefaultAttributeType(name);
- }
- for (MonitorProvider<? extends MonitorProviderCfg> monitor :
- monitorProviders)
+ AttributeType attrType = DirectoryServer.getAttributeType(name.toLowerCase(), name);
+ for (MonitorProvider<? extends MonitorProviderCfg> monitor : monitorProviders)
{
for (org.opends.server.types.Attribute a : monitor.getMonitorData())
{
@@ -588,12 +582,7 @@
// It's possible that this is a monitor attribute rather than a
// configurable one. Check all of those.
- AttributeType attrType =
- DirectoryServer.getAttributeType(name.toLowerCase());
- if (attrType == null)
- {
- attrType = DirectoryServer.getDefaultAttributeType(name);
- }
+ AttributeType attrType = DirectoryServer.getAttributeType(name.toLowerCase(), name);
monitorLoop:
for (MonitorProvider<? extends MonitorProviderCfg> monitor :
--
Gitblit v1.10.0