From b0cf989c6727f18d0c7ee80b4753ef95d60955ea Mon Sep 17 00:00:00 2001
From: neil_a_wilson <neil_a_wilson@localhost>
Date: Mon, 25 Jun 2007 01:46:55 +0000
Subject: [PATCH] Migrate the monitor provider configuration to the admin framework.

---
 opends/src/server/org/opends/server/core/ConnectionHandlerConfigManager.java |   19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/opends/src/server/org/opends/server/core/ConnectionHandlerConfigManager.java b/opends/src/server/org/opends/server/core/ConnectionHandlerConfigManager.java
index aaef4f4..a47e580 100644
--- a/opends/src/server/org/opends/server/core/ConnectionHandlerConfigManager.java
+++ b/opends/src/server/org/opends/server/core/ConnectionHandlerConfigManager.java
@@ -110,7 +110,7 @@
       DN dn = configuration.dn();
       try {
         // Attempt to start the connection handler.
-        ConnectionHandler connectionHandler =
+        ConnectionHandler<? extends ConnectionHandlerCfg> connectionHandler =
           getConnectionHandler(configuration);
         connectionHandler.start();
 
@@ -179,8 +179,9 @@
 
           // Register the connection handler with the Directory
           // Server.
-          DirectoryServer
-              .registerConnectionHandler(connectionHandler);
+          DirectoryServer.registerConnectionHandler(
+               (ConnectionHandler<? extends ConnectionHandlerCfg>)
+               connectionHandler);
         } catch (ConfigException e) {
           if (debugEnabled())
           {
@@ -305,7 +306,8 @@
         // because we're still in the startup process. Therefore, we
         // will not do so and allow the server to start it at the very
         // end of the initialization process.
-        ConnectionHandler connectionHandler = getConnectionHandler(config);
+        ConnectionHandler<? extends ConnectionHandlerCfg> connectionHandler =
+             getConnectionHandler(config);
 
         // Put this connection handler in the hash so that we will be
         // able to find it if it is altered.
@@ -366,8 +368,10 @@
 
 
   // Load and initialize the connection handler named in the config.
-  private ConnectionHandler getConnectionHandler(
-      ConnectionHandlerCfg config) throws ConfigException {
+  private ConnectionHandler<? extends ConnectionHandlerCfg>
+               getConnectionHandler(ConnectionHandlerCfg config)
+          throws ConfigException
+  {
     String className = config.getJavaImplementationClass();
     ConnectionHandlerCfgDefn d =
       ConnectionHandlerCfgDefn.getInstance();
@@ -419,7 +423,8 @@
     }
 
     // The connection handler has been successfully initialized.
-    return connectionHandler;
+    return (ConnectionHandler<? extends ConnectionHandlerCfg>)
+           connectionHandler;
   }
 
 

--
Gitblit v1.10.0