From fd9b545c230bd0ce4169c5e64d5f90809147e4ce Mon Sep 17 00:00:00 2001
From: fguigues <fguigues@localhost>
Date: Mon, 26 May 2008 14:16:50 +0000
Subject: [PATCH] Fixes :
---
opendj-sdk/opends/src/snmp/src/org/opends/server/snmp/DsApplIfOpsEntryImpl.java | 14 ++++++++++++--
opendj-sdk/opends/src/snmp/src/org/opends/server/snmp/SNMPConnectionHandler.java | 3 ++-
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/opendj-sdk/opends/src/snmp/src/org/opends/server/snmp/DsApplIfOpsEntryImpl.java b/opendj-sdk/opends/src/snmp/src/org/opends/server/snmp/DsApplIfOpsEntryImpl.java
index 67e2120..8358769 100644
--- a/opendj-sdk/opends/src/snmp/src/org/opends/server/snmp/DsApplIfOpsEntryImpl.java
+++ b/opendj-sdk/opends/src/snmp/src/org/opends/server/snmp/DsApplIfOpsEntryImpl.java
@@ -97,8 +97,18 @@
* @return an OID representing the connection handler:port
*/
public String getDsApplIfProtocol() {
-// return new String("1.3.6.1..27.3.") + portNumber;
- return DsApplIfProtocol;
+ String portNumber = (String)this.monitor.getAttribute
+ (this.connectionHandlerName, "ds-connectionhandler-listener");
+ if (portNumber==null) {
+ return this.DsApplIfProtocol;
+ }
+ else {
+ int index = portNumber.lastIndexOf(":");
+ if (index==-1) {
+ return this.DsApplIfProtocol;
+ }
+ return new String("1.3.6.1..27.3.") + portNumber.substring(index+1);
+ }
}
/**
diff --git a/opendj-sdk/opends/src/snmp/src/org/opends/server/snmp/SNMPConnectionHandler.java b/opendj-sdk/opends/src/snmp/src/org/opends/server/snmp/SNMPConnectionHandler.java
index 2714626..412942b 100644
--- a/opendj-sdk/opends/src/snmp/src/org/opends/server/snmp/SNMPConnectionHandler.java
+++ b/opendj-sdk/opends/src/snmp/src/org/opends/server/snmp/SNMPConnectionHandler.java
@@ -262,7 +262,8 @@
@SuppressWarnings("unchecked")
private void addFile(File file) {
try {
- URL u = new URL("jar:file:/"+ file.toString()+"!/");
+ String url = "jar:" + file.toURI().toURL() + "!/";
+ URL u = new URL(url);
Class[] parameters = new Class[]{URL.class};
URLClassLoader sysloader =
(URLClassLoader)ClassLoader.getSystemClassLoader();
--
Gitblit v1.10.0