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

[t...@freenetproject.org]

Author: toad
Date: 2007-02-21 03:33:47 +0000 (Wed, 21 Feb 2007)
New Revision: 11876

Modified:
   trunk/freenet/src/freenet/node/SendableGet.java
Log:
Logging on some wierd exit cases.

Modified: trunk/freenet/src/freenet/node/SendableGet.java
===================================================================
--- trunk/freenet/src/freenet/node/SendableGet.java     2007-02-21 03:25:11 UTC 
(rev 11875)
+++ trunk/freenet/src/freenet/node/SendableGet.java     2007-02-21 03:33:47 UTC 
(rev 11876)
@@ -56,9 +56,11 @@
         * this one from the queue. */
        public boolean send(NodeClientCore core) {
                FetchContext ctx = getContext();
+               boolean logMINOR = Logger.shouldLog(Logger.MINOR, this);
                while(true) {
                        synchronized (this) {
                                if(isCancelled()) {
+                                       if(logMINOR) Logger.minor(this, 
"Cancelled: "+this);
                                        onFailure(new 
LowLevelGetException(LowLevelGetException.CANCELLED), -1);
                                        return false;
                                }       
@@ -67,9 +69,15 @@
                        int keyNum = -1;
                        try {
                                keyNum = chooseKey();
-                               if(keyNum == -1) return false;
+                               if(keyNum == -1) {
+                                       if(logMINOR) Logger.minor(this, "No 
more keys: "+this);
+                                       return false;
+                               }
                                ClientKey key = getKey(keyNum);
-                               if(key == null) continue;
+                               if(key == null) {
+                                       if(logMINOR) Logger.minor(this, "No key 
"+keyNum+": "+this);
+                                       continue;
+                               }
                                block = core.realGetKey(key, 
ctx.localRequestOnly, ctx.cacheLocalRequests, ctx.ignoreStore);
                        } catch (LowLevelGetException e) {
                                onFailure(e, keyNum);