From f0e161f5307221316eef2c2c7aa8261c66d0d83b Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Wed, 29 Jan 2014 13:35:17 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-1288 : Migrate I18n and logging support to i18n framework and SLF4J
---
opendj3-server-dev/src/snmp/src/org/opends/server/snmp/DsMIBImpl.java | 36 +++++++++++++-----------------------
1 files changed, 13 insertions(+), 23 deletions(-)
diff --git a/opendj3-server-dev/src/snmp/src/org/opends/server/snmp/DsMIBImpl.java b/opendj3-server-dev/src/snmp/src/org/opends/server/snmp/DsMIBImpl.java
index ed85b1e..ed42140 100644
--- a/opendj3-server-dev/src/snmp/src/org/opends/server/snmp/DsMIBImpl.java
+++ b/opendj3-server-dev/src/snmp/src/org/opends/server/snmp/DsMIBImpl.java
@@ -22,25 +22,26 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2012 ForgeRock Inc.
+ * Portions Copyright 2012-2014 ForgeRock Inc.
*/
package org.opends.server.snmp;
import javax.management.MBeanServer;
+
import com.sun.management.snmp.agent.SnmpMib;
+
import java.util.HashSet;
import java.util.Hashtable;
import java.util.Iterator;
import java.util.Set;
+
import javax.management.MBeanServerNotification;
import javax.management.Notification;
import javax.management.NotificationListener;
import javax.management.ObjectName;
-import org.opends.server.loggers.debug.DebugLogger;
-import org.opends.server.loggers.debug.DebugTracer;
-import org.opends.server.types.DebugLogLevel;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
/**
* The class represents the "DsMIB" group implementation.
@@ -56,10 +57,7 @@
*/
private static final long serialVersionUID = 6787374593664749374L;
- /**
- * The debug log tracer for this class.
- */
- private static final DebugTracer TRACER = DebugLogger.getTracer();
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
/**
* Directory Server MIB access.
@@ -132,9 +130,7 @@
// Initialize the MIB
initDsTables();
- if (DebugLogger.debugEnabled()) {
- TRACER.debugVerbose("DsMIB Group Created");
- }
+ logger.trace("DsMIB Group Created");
}
/**
@@ -211,9 +207,7 @@
"JMImplementation:type=MBeanServerDelegate");
this.server.addNotificationListener(name, this, null, null);
} catch (Exception ex) {
- if (DebugLogger.debugEnabled()) {
- TRACER.debugCaught(DebugLogLevel.ERROR, ex);
- }
+ logger.traceException(ex);
}
}
@@ -260,15 +254,13 @@
// Add the entry in the table
this.DsTable.addEntry(entry, entry.getObjectName());
- this.dsTableEntries.put(entry.getObjectName(), (DsEntry)entry);
+ this.dsTableEntries.put(entry.getObjectName(), entry);
if (this.registeredSnmpMBean) {
// Register the SNMP OID MBean
this.server.registerMBean(entry, entry.getObjectName());
}
} catch (Exception ex) {
- if (DebugLogger.debugEnabled()) {
- TRACER.debugCaught(DebugLogLevel.ERROR, ex);
- }
+ logger.traceException(ex);
return false;
}
return true;
@@ -309,10 +301,8 @@
this.server.registerMBean(entry, entry.getObjectName());
}
} catch (Exception ex) {
- if (DebugLogger.debugEnabled()) {
- TRACER.debugCaught(DebugLogLevel.ERROR, ex);
- }
- return false;
+ logger.traceException(ex);
+ return false;
}
return true;
}
@@ -331,7 +321,7 @@
DsApplIfOpsEntryImpl entry = (DsApplIfOpsEntryImpl)
this.dsApplIfOpsTableEntries.get(connectionHandlerName);
- this.DsApplIfOpsTable.removeEntry((DsApplIfOpsEntryMBean) entry);
+ this.DsApplIfOpsTable.removeEntry(entry);
this.dsApplIfOpsTableEntries.remove(connectionHandlerName);
this.server.unregisterMBean(entry.getObjectName());
return true;
--
Gitblit v1.10.0