Author: j16sdiz
Date: 2009-03-11 02:06:02 +0000 (Wed, 11 Mar 2009)
New Revision: 25980
Modified:
trunk/freenet/
trunk/freenet/src/freenet/client/
trunk/freenet/src/freenet/pluginmanager/PluginManager.java
Log:
backport r25977: fix npe, better error handling/reporting
Property changes on: trunk/freenet
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/db4o:25594
/branches/db4o/freenet:24785,25282,25290,25332,25351-25352,25355-25356,25479,25488,25505,25540,25594,25673,25713-25714,25931
+ /branches/db4o:25594
/branches/db4o/freenet:24785,25282,25290,25332,25351-25352,25355-25356,25479,25488,25505,25540,25594,25673,25713-25714,25931,25977
Property changes on: trunk/freenet/src/freenet/client
___________________________________________________________________
Modified: svn:mergeinfo
-
/branches/db4o/freenet/src/freenet/client:24785,25282,25290,25332,25351-25353,25355-25356,25479,25488,25505,25540,25594,25673,25713-25714,25931
/branches/db4o/src/freenet/client:25594
+
/branches/db4o/freenet/src/freenet/client:24785,25282,25290,25332,25351-25353,25355-25356,25479,25488,25505,25540,25594,25673,25713-25714,25931,25977
/branches/db4o/src/freenet/client:25594
Modified: trunk/freenet/src/freenet/pluginmanager/PluginManager.java
===================================================================
--- trunk/freenet/src/freenet/pluginmanager/PluginManager.java 2009-03-10
20:25:52 UTC (rev 25979)
+++ trunk/freenet/src/freenet/pluginmanager/PluginManager.java 2009-03-11
02:06:02 UTC (rev 25980)
@@ -547,9 +547,9 @@
synchronized(toadletList) {
handler = toadletList.get(plugin);
}
- /*if (handler == null)
- return null;
- */
+ if (handler == null)
+ throw new NotFoundPluginHTTPException("Plugin
'"+plugin+"' not found!", "/plugins");
+
ClassLoader oldClassLoader =
Thread.currentThread().getContextClassLoader();
ClassLoader pluginClassLoader =
handler.getClass().getClassLoader();
Thread.currentThread().setContextClassLoader(pluginClassLoader);
@@ -559,7 +559,7 @@
} finally {
Thread.currentThread().setContextClassLoader(oldClassLoader);
}
- throw new NotFoundPluginHTTPException("Plugin not found!",
"/plugins");
+ throw new NotFoundPluginHTTPException("Plugin '"+plugin+"' not
found!", "/plugins");
}
public void killPlugin(String name, int maxWaitTime) {
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
