[freenet-cvs] r12122 - trunk/freenet/src/freenet/pluginmanager

[nextg...@freenetproject.org]

Author: nextgens
Date: 2007-03-15 17:18:42 +0000 (Thu, 15 Mar 2007)
New Revision: 12122

Modified:
   trunk/freenet/src/freenet/pluginmanager/PluginManager.java
Log:
Prevent a possible NPE (readLine can return null)

Modified: trunk/freenet/src/freenet/pluginmanager/PluginManager.java
===================================================================
--- trunk/freenet/src/freenet/pluginmanager/PluginManager.java  2007-03-15 
17:13:10 UTC (rev 12121)
+++ trunk/freenet/src/freenet/pluginmanager/PluginManager.java  2007-03-15 
17:18:42 UTC (rev 12122)
@@ -346,7 +346,11 @@
                                                in = new BufferedReader(
                                                                new 
InputStreamReader(uc.getInputStream()));

-                                               realURL = in.readLine().trim();
+                                               realURL = in.readLine();
+                                               if(realURL == null)
+                                                       throw new 
PluginNotFoundException("Initialization error: " + url +
+                                                                       " isn't 
a plugin loading url!");
+                                               realURL = realURL.trim();
                                                if(logMINOR) Logger.minor(this, 
"Loaded new URL: "+realURL+" from .url file");
                                                in.close();
                                        }