mwomack 2002/11/21 20:52:19
Modified: src/java/org/apache/log4j PluginRegistry.java
Log:
Fix trivial bug with null plugin names.
Revision Changes Path
1.2 +11 -3 jakarta-log4j/src/java/org/apache/log4j/PluginRegistry.java
Index: PluginRegistry.java
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/PluginRegistry.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PluginRegistry.java 20 Sep 2002 05:30:01 -0000 1.1
+++ PluginRegistry.java 22 Nov 2002 04:52:19 -0000 1.2
@@ -47,8 +47,12 @@
repositoryMap.put(repository, pluginMap);
}
- // existing plugin exists with the
- Plugin existingPlugin = (Plugin)pluginMap.get(plugin.getName());
+ // existing plugin exists with the
+ String name = plugin.getName();
+ if (name == null) {
+ name = "";
+ }
+ Plugin existingPlugin = (Plugin)pluginMap.get(name);
if (existingPlugin != null) {
boolean isEqual = existingPlugin.equals(plugin);
@@ -62,7 +66,7 @@
}
// put the new plugin into the map
- pluginMap.put(plugin.getName(), plugin);
+ pluginMap.put(name, plugin);
// start the new plugin
plugin.activateOptions();
@@ -96,6 +100,10 @@
Stops a plugin in the given logger repository. */
public static Plugin stopPlugin(String pluginName,
LoggerRepository repository) {
+ String name = pluginName;
+ if (pluginName == null) {
+ pluginName = "";
+ }
synchronized(repositoryMap) {
Hashtable pluginMap = (Hashtable)repositoryMap.get(repository);
if (pluginMap == null)
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
