From 873c5e7a10dc487f9f70719717eed7fd42e3bb13 Mon Sep 17 00:00:00 2001
From: neil_a_wilson <neil_a_wilson@localhost>
Date: Fri, 14 Sep 2007 15:51:17 +0000
Subject: [PATCH] Revert a change (committed in revision 3066) that added support for changing the plugin type values on the fly and update the configuration definition to indicate that this is not supported and to note that changes to the defined plugin types will only take effect if the plugin is disabled and re-enabled or the server is restarted.
---
opends/src/server/org/opends/server/core/PluginConfigManager.java | 20 +++++++-------------
1 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/opends/src/server/org/opends/server/core/PluginConfigManager.java b/opends/src/server/org/opends/server/core/PluginConfigManager.java
index 0f0ee74..e65bf24 100644
--- a/opends/src/server/org/opends/server/core/PluginConfigManager.java
+++ b/opends/src/server/org/opends/server/core/PluginConfigManager.java
@@ -5411,7 +5411,7 @@
// Get the existing plugin if it's already enabled.
- DirectoryServerPlugin<? extends PluginCfg> existingPlugin =
+ DirectoryServerPlugin existingPlugin =
registeredPlugins.get(configuration.dn());
@@ -5441,19 +5441,9 @@
{
adminActionRequired = true;
}
- //The plugin-types might have been changed. Replace the plugin's
- //plugin-types with the configuration's plugin-types and re-register the
- //plugin with new types.
- Set<PluginType> currPluginTypes = existingPlugin.getPluginTypes();
- currPluginTypes.clear();
- for (PluginCfgDefn.PluginType pluginType :
- configuration.getPluginType())
- {
- currPluginTypes.add(getPluginType(pluginType));
- }
+
existingPlugin.setInvokeForInternalOperations(
configuration.isInvokeForInternalOperations());
- registerPlugin(existingPlugin, configuration.dn(), currPluginTypes);
return new ConfigChangeResult(resultCode, adminActionRequired, messages);
}
@@ -5473,7 +5463,11 @@
}
catch (InitializationException ie)
{
- resultCode = DirectoryServer.getServerErrorResultCode();
+ if (resultCode == ResultCode.SUCCESS)
+ {
+ resultCode = DirectoryServer.getServerErrorResultCode();
+ }
+
messages.add(ie.getMessageObject());
}
--
Gitblit v1.10.0