[freenet-cvs] r10989 - trunk/freenet/src/freenet/node/updater

[t...@freenetproject.org]

Author: toad
Date: 2006-11-18 18:24:32 +0000 (Sat, 18 Nov 2006)
New Revision: 10989

Modified:
   trunk/freenet/src/freenet/node/updater/NodeUpdaterManager.java
Log:
Kill update fetchers when key blown. Check for key blown slightly earlier.

Modified: trunk/freenet/src/freenet/node/updater/NodeUpdaterManager.java
===================================================================
--- trunk/freenet/src/freenet/node/updater/NodeUpdaterManager.java      
2006-11-18 18:21:13 UTC (rev 10988)
+++ trunk/freenet/src/freenet/node/updater/NodeUpdaterManager.java      
2006-11-18 18:24:32 UTC (rev 10989)
@@ -279,6 +279,7 @@
                long startedMillisAgo = -1;
                synchronized(this) {
                        if(!(hasNewMainJar || hasNewExtJar)) return false; // 
no jar
+                       if(hasBeenBlown) return false; // Duh
                        // Don't immediately deploy if still fetching
                        startedMillisAgo = now - 
Math.max(startedFetchingNextMainJar, startedFetchingNextExtJar);
                        if(startedMillisAgo < WAIT_FOR_SECOND_FETCH_TO_COMPLETE)
@@ -527,6 +528,7 @@
        }

        public void blow(String msg){
+               NodeUpdater main, ext;
                synchronized(this) {
                        if(hasBeenBlown){
                                Logger.error(this, "The key has ALREADY been 
marked as blown! Message was "+revocationMessage+" new message "+msg);
@@ -544,7 +546,13 @@
                                        } catch (Throwable t1) {}
                                }
                        }
+                       main = mainUpdater;
+                       ext = extUpdater;
+                       if(main != null) main.preKill();
+                       if(ext != null) ext.preKill();
                }
+               if(main != null) main.kill();
+               if(ext != null) ext.kill();
                if(revocationAlert==null){
                        revocationAlert = new RevocationKeyFoundUserAlert(msg);
                        node.clientCore.alerts.register(revocationAlert);