Author: toad
Date: 2007-07-14 13:51:41 +0000 (Sat, 14 Jul 2007)
New Revision: 14100
Modified:
trunk/freenet/src/freenet/pluginmanager/PluginHandler.java
trunk/freenet/src/freenet/pluginmanager/PluginManager.java
Log:
I'm not sure exactly why this worked before...
Modified: trunk/freenet/src/freenet/pluginmanager/PluginHandler.java
===================================================================
--- trunk/freenet/src/freenet/pluginmanager/PluginHandler.java 2007-07-14
11:04:01 UTC (rev 14099)
+++ trunk/freenet/src/freenet/pluginmanager/PluginHandler.java 2007-07-14
13:51:41 UTC (rev 14100)
@@ -80,11 +80,13 @@
System.err.println("Caught Throwable
while running plugin: "+t);
t.printStackTrace();
}
+ if(!(plugin instanceof FredPluginThreadless))
+ pm.removePlugin(this);
+ } else {
+ // If not FredPlugin, then the whole thing is
aborted,
+ // and then this method will return, killing
the thread
+ return;
}
- // If not FredPlugin, then the whole thing is aborted,
- // and then this method will return, killing the thread
-
- pm.removePlugin(this);
}
}
Modified: trunk/freenet/src/freenet/pluginmanager/PluginManager.java
===================================================================
--- trunk/freenet/src/freenet/pluginmanager/PluginManager.java 2007-07-14
11:04:01 UTC (rev 14099)
+++ trunk/freenet/src/freenet/pluginmanager/PluginManager.java 2007-07-14
13:51:41 UTC (rev 14100)
@@ -177,7 +177,7 @@
try {
toadletList.remove(pi.getPluginClassName());
Logger.normal(this,
"Removed HTTP handler for /plugins/"+
-
pi.getPluginClassName()+ '/');
+
pi.getPluginClassName()+ '/', new Exception("debug"));
} catch (Throwable ex) {
Logger.error(this,
"removing Plugin", ex);
}
