Author: toad
Date: 2007-09-08 15:24:41 +0000 (Sat, 08 Sep 2007)
New Revision: 15041
Modified:
trunk/freenet/src/freenet/pluginmanager/PluginManager.java
Log:
Break a nested lock
Modified: trunk/freenet/src/freenet/pluginmanager/PluginManager.java
===================================================================
--- trunk/freenet/src/freenet/pluginmanager/PluginManager.java 2007-09-08
15:22:50 UTC (rev 15040)
+++ trunk/freenet/src/freenet/pluginmanager/PluginManager.java 2007-09-08
15:24:41 UTC (rev 15041)
@@ -176,14 +176,14 @@
PluginInfoWrapper removed = null;
synchronized (pluginWrappers) {
pluginWrappers.remove(pi);
- synchronized (toadletList) {
- try {
-
toadletList.remove(pi.getPluginClassName());
- Logger.normal(this, "Removed HTTP
handler for /plugins/"+
-
pi.getPluginClassName()+ '/', new Exception("debug"));
- } catch (Throwable ex) {
- Logger.error(this, "removing Plugin",
ex);
- }
+ }
+ synchronized (toadletList) {
+ try {
+ toadletList.remove(pi.getPluginClassName());
+ Logger.normal(this, "Removed HTTP handler for
/plugins/"+
+ pi.getPluginClassName()+ '/',
new Exception("debug"));
+ } catch (Throwable ex) {
+ Logger.error(this, "removing Plugin", ex);
}
}
if(removed != null)
