Author: toad
Date: 2008-02-07 00:17:36 +0000 (Thu, 07 Feb 2008)
New Revision: 17635

Modified:
   trunk/freenet/src/freenet/node/RequestSender.java
Log:
Treat a fatal timeout, CHK transfer failed or CHK verify failed the same as a 
DNF: full 10 minute timeout.

Modified: trunk/freenet/src/freenet/node/RequestSender.java
===================================================================
--- trunk/freenet/src/freenet/node/RequestSender.java   2008-02-07 00:12:33 UTC 
(rev 17634)
+++ trunk/freenet/src/freenet/node/RequestSender.java   2008-02-07 00:17:36 UTC 
(rev 17635)
@@ -553,7 +553,7 @@
                        next.localRejectedOverload("FatalTimeout");
                        forwardRejectedOverload();
                        finish(TIMED_OUT, next, false);
-                       node.failureTable.onFinalFailure(key, next, htl, -1, 
source);
+                       node.failureTable.onFinalFailure(key, next, htl, 
FailureTable.REJECT_TIME, source);
                        return;
                }

@@ -698,7 +698,7 @@
                                        } catch (KeyVerifyException e1) {
                                                Logger.normal(this, "Got data 
but verify failed: "+e1, e1);
                                                finish(VERIFY_FAILURE, next, 
false);
-                                               
node.failureTable.onFinalFailure(key, next, htl, -1, source);
+                                               
node.failureTable.onFinalFailure(key, next, htl, FailureTable.REJECT_TIME, 
source);
                                                return;
                                        }
                                        finish(SUCCESS, next, false);
@@ -709,7 +709,7 @@
                                                        else
                                                                
Logger.error(this, "Transfer failed 
("+e.getReason()+"/"+RetrievalException.getErrString(e.getReason())+"): "+e, e);
                                        finish(TRANSFER_FAILED, next, false);
-                                       node.failureTable.onFinalFailure(key, 
next, htl, -1, source);
+                                       node.failureTable.onFinalFailure(key, 
next, htl, FailureTable.REJECT_TIME, source);
                                        return;
                                }
                        } finally {


Reply via email to