From 1072d2b5948211a94881d418f6f56af9775c9dbc Mon Sep 17 00:00:00 2001
From: fguigues <fguigues@localhost>
Date: Mon, 23 Feb 2009 16:06:56 +0000
Subject: [PATCH] Fix 3687 : SNMP: incorrect value for dsApplIfProtocol entry after server restart Fix 3690 : SNMP: incorrect value for dsServerDescription entry

---
 opends/src/snmp/src/org/opends/server/snmp/DsTableEntryImpl.java |    9 +++++----
 1 files changed, 5 insertions(+), 4 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 b78f2d5..dec8180 100644
--- a/opends/src/snmp/src/org/opends/server/snmp/DsTableEntryImpl.java
+++ b/opends/src/snmp/src/org/opends/server/snmp/DsTableEntryImpl.java
@@ -22,15 +22,17 @@
  * CDDL HEADER END
  *
  *
- *      Copyright 2008 Sun Microsystems, Inc.
+ *      Copyright 2008-2009 Sun Microsystems, Inc.
  */
 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.server.loggers.debug.DebugLogger;
 import org.opends.server.loggers.debug.DebugTracer;
 import org.opends.server.types.DebugLogLevel;
@@ -178,9 +180,8 @@
     public String getDsServerDescription() {
         String result = null;
         try {
-            result = (String) this.monitor.getAttribute(
-        SNMPConnectionHandlerDefinitions.MONITOR_SYSTEM_INFORMATION_OBJECTNAME,
-                    "workingDirectory");
+            result = DirectoryServer.getServerRoot() +
+                    File.separatorChar + "bin";
         } catch (Exception ex) {
             if (DebugLogger.debugEnabled()) {
                 TRACER.debugCaught(DebugLogLevel.ERROR, ex);

--
Gitblit v1.10.0