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

[t...@freenetproject.org]

Author: toad
Date: 2006-03-09 18:50:12 +0000 (Thu, 09 Mar 2006)
New Revision: 8201

Modified:
   trunk/freenet/src/freenet/client/async/SingleBlockInserter.java
   trunk/freenet/src/freenet/client/async/SingleFileFetcher.java
   trunk/freenet/src/freenet/node/Version.java
Log:
511:
max retries = -1 -> retry forever or until explicitly cancelled.

Modified: trunk/freenet/src/freenet/client/async/SingleBlockInserter.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SingleBlockInserter.java     
2006-03-09 18:46:57 UTC (rev 8200)
+++ trunk/freenet/src/freenet/client/async/SingleBlockInserter.java     
2006-03-09 18:50:12 UTC (rev 8201)
@@ -153,7 +153,7 @@
                } else
                        consecutiveRNFs = 0;
                Logger.minor(this, "Failed: "+e);
-               if(retries > ctx.maxInsertRetries) {
+               if(retries > ctx.maxInsertRetries && ctx.maxInsertRetries != 
-1) {
                        if(errors.isOneCodeOnly())
                                fail(new 
InserterException(errors.getFirstCode()));
                        else

Modified: trunk/freenet/src/freenet/client/async/SingleFileFetcher.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SingleFileFetcher.java       
2006-03-09 18:46:57 UTC (rev 8200)
+++ trunk/freenet/src/freenet/client/async/SingleFileFetcher.java       
2006-03-09 18:50:12 UTC (rev 8201)
@@ -479,7 +479,7 @@
                        e = new FetchException(FetchException.CANCELLED);
                }
                if(!(e.isFatal() || forceFatal) ) {
-                       if(retryCount <= maxRetries) {
+                       if((retryCount <= maxRetries) && maxRetries != -1) {
                                if(parent.isCancelled()) {
                                        onFailure(new 
FetchException(FetchException.CANCELLED));
                                        return;

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-03-09 18:46:57 UTC (rev 
8200)
+++ trunk/freenet/src/freenet/node/Version.java 2006-03-09 18:50:12 UTC (rev 
8201)
@@ -20,7 +20,7 @@
        public static final String protocolVersion = "1.0";

        /** The build number of the current revision */
-       private static final int buildNumber = 510;
+       private static final int buildNumber = 511;

        /** Oldest build of Fred we will talk to */
        private static final int lastGoodBuild = 507;