[freenet-cvs] r16765 - trunk/freenet/src/freenet/node

[rob...@freenetproject.org]

Author: robert
Date: 2007-12-21 15:51:35 +0000 (Fri, 21 Dec 2007)
New Revision: 16765

Modified:
   trunk/freenet/src/freenet/node/CHKInsertSender.java
Log:
revert r16756 & r16757, leave comment


Modified: trunk/freenet/src/freenet/node/CHKInsertSender.java
===================================================================
--- trunk/freenet/src/freenet/node/CHKInsertSender.java 2007-12-21 14:55:56 UTC 
(rev 16764)
+++ trunk/freenet/src/freenet/node/CHKInsertSender.java 2007-12-21 15:51:35 UTC 
(rev 16765)
@@ -106,7 +106,7 @@
                        if (m==null) {
                                /* FIXME: Cascading timeout...
                                 if this times out, we don't have any time to 
report to the node of origin the timeout notification (anyTimedOut?).
-                                ameliorated by 'cascading_timout_grace' 
(below) */
+                                */
                                Logger.error(this, "Timed out waiting for a 
final ack from: "+pn);
                                receivedNotice(false);
                                return;
@@ -131,8 +131,7 @@
                }

                private MessageFilter getNotificationMessageFilter() {
-                       int cascading_timout_grace=500*htl;
-                       return MessageFilter.create().setField(DMT.UID, 
uid).setType(DMT.FNPInsertTransfersCompleted).setSource(pn).setTimeout(TRANSFER_COMPLETION_ACK_TIMEOUT+cascading_timout_grace);
+                       return MessageFilter.create().setField(DMT.UID, 
uid).setType(DMT.FNPInsertTransfersCompleted).setSource(pn).setTimeout(TRANSFER_COMPLETION_ACK_TIMEOUT);
                }
        }