From 5ceb2e9601d2501d021d0c61188ec913076555a0 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Wed, 26 Sep 2007 12:21:02 +0000
Subject: [PATCH] Merge branches/temp-admin@3208 onto trunk@3208.
---
opends/src/server/org/opends/server/core/ConnectionHandlerConfigManager.java | 14 +++++++-------
1 files changed, 7 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 93adfa7..79e359f 100644
--- a/opends/src/server/org/opends/server/core/ConnectionHandlerConfigManager.java
+++ b/opends/src/server/org/opends/server/core/ConnectionHandlerConfigManager.java
@@ -137,7 +137,7 @@
messages.add(ERR_CONFIG_CONNHANDLER_CANNOT_INITIALIZE.get(
- String.valueOf(configuration.getJavaImplementationClass()),
+ String.valueOf(configuration.getJavaClass()),
String.valueOf(dn),
stackTraceToSingleLineString(e)));
resultCode = DirectoryServer.getServerErrorResultCode();
@@ -200,7 +200,7 @@
messages.add(ERR_CONFIG_CONNHANDLER_CANNOT_INITIALIZE.get(
String.valueOf(configuration
- .getJavaImplementationClass()), String.valueOf(dn),
+ .getJavaClass()), String.valueOf(dn),
stackTraceToSingleLineString(e)));
resultCode = DirectoryServer.getServerErrorResultCode();
}
@@ -212,7 +212,7 @@
// applied dynamically, so if the class name did change then
// indicate that administrative action is required for that
// change to take effect.
- String className = configuration.getJavaImplementationClass();
+ String className = configuration.getJavaClass();
if (!className.equals(connectionHandler.getClass().getName())) {
adminActionRequired = true;
}
@@ -374,11 +374,11 @@
getConnectionHandler(ConnectionHandlerCfg config)
throws ConfigException
{
- String className = config.getJavaImplementationClass();
+ String className = config.getJavaClass();
ConnectionHandlerCfgDefn d =
ConnectionHandlerCfgDefn.getInstance();
ClassPropertyDefinition pd = d
- .getJavaImplementationClassPropertyDefinition();
+ .getJavaClassPropertyDefinition();
// Load the class and cast it to a connection handler.
Class<? extends ConnectionHandler> theClass;
@@ -434,11 +434,11 @@
private boolean isJavaClassAcceptable(
ConnectionHandlerCfg config,
List<Message> unacceptableReasons) {
- String className = config.getJavaImplementationClass();
+ String className = config.getJavaClass();
ConnectionHandlerCfgDefn d =
ConnectionHandlerCfgDefn.getInstance();
ClassPropertyDefinition pd = d
- .getJavaImplementationClassPropertyDefinition();
+ .getJavaClassPropertyDefinition();
// Load the class and cast it to a connection handler.
ConnectionHandler connectionHandler = null;
--
Gitblit v1.10.0