From 67405dde9ba213331dab1fc46cb18c485070fd5b Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Fri, 05 Jun 2009 09:04:50 +0000
Subject: [PATCH] svn merge -r5333:5417 https://opends.dev.java.net/svn/opends/branches/b2.0
---
opends/src/server/org/opends/server/core/ConnectionHandlerConfigManager.java | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/opends/src/server/org/opends/server/core/ConnectionHandlerConfigManager.java b/opends/src/server/org/opends/server/core/ConnectionHandlerConfigManager.java
index 69218b1..4bd7ef7 100644
--- a/opends/src/server/org/opends/server/core/ConnectionHandlerConfigManager.java
+++ b/opends/src/server/org/opends/server/core/ConnectionHandlerConfigManager.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2006-2008 Sun Microsystems, Inc.
+ * Copyright 2006-2009 Sun Microsystems, Inc.
*/
package org.opends.server.core;
import org.opends.messages.Message;
@@ -163,7 +163,7 @@
// Attempt to get the existing connection handler. This will only
// succeed if it was enabled.
DN dn = configuration.dn();
- ConnectionHandler connectionHandler = connectionHandlers.get(dn);
+ ConnectionHandler<?> connectionHandler = connectionHandlers.get(dn);
// Default result code.
ResultCode resultCode = ResultCode.SUCCESS;
@@ -185,9 +185,7 @@
// Register the connection handler with the Directory
// Server.
- DirectoryServer.registerConnectionHandler(
- (ConnectionHandler<? extends ConnectionHandlerCfg>)
- connectionHandler);
+ DirectoryServer.registerConnectionHandler(connectionHandler);
} catch (ConfigException e) {
if (debugEnabled())
{
@@ -228,7 +226,7 @@
connectionHandler.finalizeConnectionHandler(
- INFO_CONNHANDLER_CLOSED_BY_DISABLE.get(), false);
+ INFO_CONNHANDLER_CLOSED_BY_DISABLE.get());
}
}
@@ -259,8 +257,7 @@
connectionHandlers.remove(dn);
connectionHandler.finalizeConnectionHandler(
- INFO_CONNHANDLER_CLOSED_BY_DELETE.get(),
- false);
+ INFO_CONNHANDLER_CLOSED_BY_DELETE.get());
}
return new ConfigChangeResult(resultCode, adminActionRequired);
@@ -421,7 +418,7 @@
// Load the class and cast it to a connection handler.
Class<? extends ConnectionHandler> theClass;
- ConnectionHandler connectionHandler;
+ ConnectionHandler<?> connectionHandler;
try {
theClass = pd.loadClass(className, ConnectionHandler.class);
@@ -461,8 +458,7 @@
}
// The connection handler has been successfully initialized.
- return (ConnectionHandler<? extends ConnectionHandlerCfg>)
- connectionHandler;
+ return connectionHandler;
}
--
Gitblit v1.10.0