[freenet-cvs] r7608 - in trunk/freenet/src/freenet: client node

[t...@freenetproject.org]

Author: toad
Date: 2005-11-25 19:10:29 +0000 (Fri, 25 Nov 2005)
New Revision: 7608

Modified:
   trunk/freenet/src/freenet/client/RetryTracker.java
   trunk/freenet/src/freenet/node/Version.java
Log:
227 (mandatory):
We were still calling finish with the RetryTracker lock held.

Modified: trunk/freenet/src/freenet/client/RetryTracker.java
===================================================================
--- trunk/freenet/src/freenet/client/RetryTracker.java  2005-11-25 18:57:21 UTC 
(rev 7607)
+++ trunk/freenet/src/freenet/client/RetryTracker.java  2005-11-25 19:10:29 UTC 
(rev 7608)
@@ -187,8 +187,8 @@
                                Level newLevel = makeLevel(levelNumber);
                                newLevel.add(block);
                        }
-                       maybeStart(false);
                }
+               maybeStart(false);
                if(callOnProgress)
                        callback.onProgress();
        }
@@ -203,8 +203,8 @@
                        fatalErrors.inc(reasonCode);
                        runningBlocks.remove(block);
                        failedBlocksFatalErrors.add(block);
-                       maybeStart(false);
                }
+               maybeStart(false);
                if(callOnProgress)
                        callback.onProgress();
        }
@@ -264,8 +264,8 @@
                        if(killed) return;
                        runningBlocks.remove(block);
                        succeededBlocks.add(block);
-                       maybeStart(false);
                }
+               maybeStart(false);
                if(callOnProgress)
                        callback.onProgress();
        }

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2005-11-25 18:57:21 UTC (rev 
7607)
+++ trunk/freenet/src/freenet/node/Version.java 2005-11-25 19:10:29 UTC (rev 
7608)
@@ -20,10 +20,10 @@
        public static final String protocolVersion = "1.0";

        /** The build number of the current revision */
-       public static final int buildNumber = 226;
+       public static final int buildNumber = 227;

        /** Oldest build of Fred we will talk to */
-       public static final int lastGoodBuild = 226;
+       public static final int lastGoodBuild = 227;

        /** The highest reported build of fred */
        public static int highestSeenBuild = buildNumber;