[freenet-cvs] r19699 - trunk/freenet/src/freenet/client/async

[toad at freenetproject.org]

Author: toad
Date: 2008-05-03 14:47:21 +0000 (Sat, 03 May 2008)
New Revision: 19699

Modified:
   trunk/freenet/src/freenet/client/async/USKManager.java
Log:
Fix NPE from FMS.

Modified: trunk/freenet/src/freenet/client/async/USKManager.java
===================================================================
--- trunk/freenet/src/freenet/client/async/USKManager.java	2008-05-03 14:02:15 UTC (rev 19698)
+++ trunk/freenet/src/freenet/client/async/USKManager.java	2008-05-03 14:47:21 UTC (rev 19699)
@@ -238,6 +238,9 @@
 			}
 			if(runBackgroundFetch) {
 				USKFetcher f = (USKFetcher) backgroundFetchersByClearUSK.get(clear);
+				if(f == null) {
+					Logger.error(this, "Unsubscribing "+cb+" for "+origUSK+" but not already subscribed", new Exception("error"));
+				} else {
 				f.removeSubscriber(cb);
 				if(!f.hasSubscribers()) {
 					if(!temporaryBackgroundFetchersLRU.contains(clear)) {
@@ -245,6 +248,7 @@
 						backgroundFetchersByClearUSK.remove(clear);
 					}
 				}
+				}
 			}
 		}
 		if(toCancel != null) toCancel.cancel();