[freenet-cvs] r19171 - trunk/freenet/src/freenet/node

[j16s...@freenetproject.org]

Author: j16sdiz
Date: 2008-04-11 08:41:35 +0000 (Fri, 11 Apr 2008)
New Revision: 19171

Modified:
   trunk/freenet/src/freenet/node/PeerNode.java
   trunk/freenet/src/freenet/node/SendableGet.java
Log:
findbugs: redundant nullcheck, value known to be non-null


Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java        2008-04-11 08:41:09 UTC 
(rev 19170)
+++ trunk/freenet/src/freenet/node/PeerNode.java        2008-04-11 08:41:35 UTC 
(rev 19171)
@@ -1967,8 +1967,9 @@
                                if(logMINOR) Logger.minor(this, "Not swapping 
KeyTracker's on "+this+" cur "+currentTracker+" prev "+previousTracker);
                        }
                } else {
-                       if(logMINOR) Logger.minor(this, "Not swapping 
KeyTracker's: previousTracker = "+(previousTracker == null ? "null" : 
previousTracker.toString()+(previousTracker.isDeprecated()?" (deprecated)":""))+
-                                       " time delta = "+delta);
+                       if (logMINOR)
+                               Logger.minor(this, "Not swapping KeyTracker's: 
previousTracker = " + previousTracker.toString()
+                                       + (previousTracker.isDeprecated() ? " 
(deprecated)" : "") + " time delta = " + delta);
                }
        }


Modified: trunk/freenet/src/freenet/node/SendableGet.java
===================================================================
--- trunk/freenet/src/freenet/node/SendableGet.java     2008-04-11 08:41:09 UTC 
(rev 19170)
+++ trunk/freenet/src/freenet/node/SendableGet.java     2008-04-11 08:41:35 UTC 
(rev 19171)
@@ -76,12 +76,6 @@
                        onFailure(new 
LowLevelGetException(LowLevelGetException.CANCELLED), null, sched);
                        return false;
                }
-               if(key == null) {
-                       if(!isCancelled()) {
-                               Logger.error(this, "Not cancelled but key 
"+keyNum+" is null?! on "+this);
-                               return false;
-                       }
-               }
                try {
                        try {
                                core.realGetKey(key, ctx.localRequestOnly, 
ctx.cacheLocalRequests, ctx.ignoreStore);