r26974 - trunk/freenet/src/freenet/client/async

Author: toad
Date: 2009-04-18 14:17:08 +0000 (Sat, 18 Apr 2009)
New Revision: 26974

Modified:
   trunk/freenet/src/freenet/client/async/USKManager.java
Log:
Logging


Modified: trunk/freenet/src/freenet/client/async/USKManager.java
===================================================================
--- trunk/freenet/src/freenet/client/async/USKManager.java	2009-04-18 14:15:17 UTC (rev 26973)
+++ trunk/freenet/src/freenet/client/async/USKManager.java	2009-04-18 14:17:08 UTC (rev 26974)
@@ -351,12 +351,7 @@
 				fetchersByUSK.remove(origUSK);
 			}
 			USKFetcher f = backgroundFetchersByClearUSK.get(clear);
-			if(f == null) {
-				if(newCallbacks.length == 0)
-					Logger.minor(this, "Unsubscribing "+cb+" for "+origUSK+" but not already subscribed. No callbacks.", new Exception("debug"));
-				else
-					Logger.error(this, "Unsubscribing "+cb+" for "+origUSK+" but not already subscribed, remaining "+newCallbacks.length+" callbacks", new Exception("error"));
-			} else {
+			if(f != null) {
 				f.removeSubscriber(cb, context);
 				if(!f.hasSubscribers()) {
 						toCancel = f;
@@ -364,12 +359,7 @@
 				}
 			}
 			f = temporaryBackgroundFetchersLRU.get(clear);
-			if(f == null) {
-				if(newCallbacks.length == 0)
-					Logger.minor(this, "Unsubscribing "+cb+" for "+origUSK+" but not already subscribed. No callbacks.", new Exception("debug"));
-				else
-					Logger.error(this, "Unsubscribing "+cb+" for "+origUSK+" but not already subscribed, remaining "+newCallbacks.length+" callbacks", new Exception("error"));
-			} else {
+			if(f != null) {
 				f.removeCallback(cb);
 				if(f.isFinished() || !f.hasCallbacks()) {
 					if(toCancel != null) {