[freenet-cvs] r20939 - branches/db4o/freenet/src/freenet/client/async

[t...@freenetproject.org]

Author: toad
Date: 2008-07-02 17:00:11 +0000 (Wed, 02 Jul 2008)
New Revision: 20939

Modified:
   
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerBase.java
Log:
Logging

Modified: 
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerBase.java
===================================================================
--- 
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerBase.java  
    2008-07-02 16:43:41 UTC (rev 20938)
+++ 
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerBase.java  
    2008-07-02 17:00:11 UTC (rev 20939)
@@ -131,7 +131,7 @@
                                        dropped = true;
                                        pendingKeys.remove(key);
                                        if(logMINOR)
-                                               Logger.minor(this, "Removed 
only getter (1) for "+key);
+                                               Logger.minor(this, "Removed 
only getter (1) for "+key, new Exception("debug"));
                                }
                        } else {
                                SendableGet[] gets = (SendableGet[]) o;
@@ -159,7 +159,7 @@
                                if(x == 0) {
                                        pendingKeys.remove(key);
                                        if(logMINOR)
-                                               Logger.minor(this, "Removed 
only getter (2) for "+key);
+                                               Logger.minor(this, "Removed 
only getter (2) for "+key, new Exception("debug"));
                                } else if(x == 1) {
                                        pendingKeys.put(key, newGets[0]);
                                } else {
@@ -176,8 +176,6 @@
        }

        public SendableGet[] removePendingKey(Key key) {
-               if(logMINOR)
-                       Logger.minor(this, "Removing all pending keys for 
"+key);
                Object o;
                final SendableGet[] gets;
                synchronized(pendingKeys) {
@@ -186,8 +184,12 @@
                if(o == null) return null;
                if(o instanceof SendableGet) {
                        gets = new SendableGet[] { (SendableGet) o };
+                       if(logMINOR)
+                               Logger.minor(this, "Removing all pending keys 
for "+key+" (1)", new Exception("debug"));
                } else {
                        gets = (SendableGet[]) o;
+                       if(logMINOR)
+                               Logger.minor(this, "Removing all pending keys 
for "+key+" ("+gets.length+")", new Exception("debug"));
                }
                return gets;
        }