From 92c3806162a84cdaa7c0d9c9ce5410bc182cbcfb Mon Sep 17 00:00:00 2001
From: fguigues <fguigues@localhost>
Date: Thu, 16 Apr 2009 12:37:36 +0000
Subject: [PATCH] Fix ServiceTag URN for 2.0 Fix ServiceTag Registration adding debug message in case of error Fix 2619 : ldap tools always return 1 in case of argument parsing error Fix 3690 : SNMP: incorrect value for dsServerDescription entry Fix an error in the util script when the install dir is != instance dir
---
opends/src/snmp/src/org/opends/server/snmp/DsTableEntryImpl.java | 14 ++------------
1 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/opends/src/snmp/src/org/opends/server/snmp/DsTableEntryImpl.java b/opends/src/snmp/src/org/opends/server/snmp/DsTableEntryImpl.java
index 7d6503b..9f08604 100644
--- a/opends/src/snmp/src/org/opends/server/snmp/DsTableEntryImpl.java
+++ b/opends/src/snmp/src/org/opends/server/snmp/DsTableEntryImpl.java
@@ -27,12 +27,11 @@
package org.opends.server.snmp;
import com.sun.management.snmp.agent.SnmpMib;
-import java.io.File;
import java.util.Iterator;
import java.util.Set;
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.opends.server.core.DirectoryServer;
+import org.opends.guitools.controlpanel.util.Utilities;
import org.opends.server.loggers.debug.DebugLogger;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.DebugLogLevel;
@@ -178,16 +177,7 @@
*/
@Override
public String getDsServerDescription() {
- String result = null;
- try {
- result = DirectoryServer.getServerRoot() +
- File.separatorChar;
- } catch (Exception ex) {
- if (DebugLogger.debugEnabled()) {
- TRACER.debugCaught(DebugLogLevel.ERROR, ex);
- }
- }
- return result;
+ return Utilities.getServerRootDirectory().getAbsolutePath();
}
/**
--
Gitblit v1.10.0