[freenet-cvs] r19167 - in trunk/freenet/src/freenet: node pluginmanager

[j16s...@freenetproject.org]

Author: j16sdiz
Date: 2008-04-11 08:02:50 +0000 (Fri, 11 Apr 2008)
New Revision: 19167

Modified:
   trunk/freenet/src/freenet/node/NodeDispatcher.java
   trunk/freenet/src/freenet/pluginmanager/PluginHandler.java
Log:
findbugs: instanceof will always return true


Modified: trunk/freenet/src/freenet/node/NodeDispatcher.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeDispatcher.java  2008-04-11 07:57:20 UTC 
(rev 19166)
+++ trunk/freenet/src/freenet/node/NodeDispatcher.java  2008-04-11 08:02:50 UTC 
(rev 19167)
@@ -594,10 +594,7 @@
         */
        boolean handleRouted(Message m, PeerNode source) {
                if(logMINOR) Logger.minor(this, "handleRouted("+m+ ')');
-               if((source != null) && (!(source instanceof PeerNode))) {
-                       Logger.error(this, "Routed message but source 
"+source+" not a PeerNode!");
-                       return true;
-               }
+
                long id = m.getLong(DMT.UID);
                Long lid = new Long(id);
                short htl = m.getShort(DMT.HTL);

Modified: trunk/freenet/src/freenet/pluginmanager/PluginHandler.java
===================================================================
--- trunk/freenet/src/freenet/pluginmanager/PluginHandler.java  2008-04-11 
07:57:20 UTC (rev 19166)
+++ trunk/freenet/src/freenet/pluginmanager/PluginHandler.java  2008-04-11 
08:02:50 UTC (rev 19167)
@@ -60,7 +60,6 @@

                public void run() {
                        boolean threadless = plugin instanceof 
FredPluginThreadless;
-                       if (plugin instanceof FredPlugin) {
                                try {
                                        if(!threadless) // Have to do it now 
because threaded
                                                pm.register(plugin, pi);
@@ -78,11 +77,6 @@
                                        pi.unregister(pm); // If not already 
unregistered
                                        pm.removePlugin(pi);
                                }
-                       } else {
-                               // If not FredPlugin, then the whole thing is 
aborted,
-                               // and then this method will return, killing 
the thread
-                               return;
-                       }
                }

        }