Author: robert
Date: 2007-12-19 21:29:28 +0000 (Wed, 19 Dec 2007)
New Revision: 16736

Modified:
   trunk/freenet/src/freenet/io/xfer/BlockTransmitter.java
   trunk/freenet/src/freenet/node/CHKInsertSender.java
Log:
ummm... looks like failedDueToOverload() was never implemented, don't rely on 
it.


Modified: trunk/freenet/src/freenet/io/xfer/BlockTransmitter.java
===================================================================
--- trunk/freenet/src/freenet/io/xfer/BlockTransmitter.java     2007-12-19 
21:29:21 UTC (rev 16735)
+++ trunk/freenet/src/freenet/io/xfer/BlockTransmitter.java     2007-12-19 
21:29:28 UTC (rev 16736)
@@ -54,7 +54,6 @@
        private LinkedList _unsent;
        private Runnable _senderThread;
        private BitArray _sentPackets;
-       boolean failedByOverload;
        final PacketThrottle throttle;
        private long timeAllSent = -1;
        final DoubleTokenBucket _masterThrottle;
@@ -327,10 +326,6 @@
                }
        }

-       public boolean failedDueToOverload() {
-               return failedByOverload;
-       }
-
        public PeerContext getDestination() {
                return _destination;
        }

Modified: trunk/freenet/src/freenet/node/CHKInsertSender.java
===================================================================
--- trunk/freenet/src/freenet/node/CHKInsertSender.java 2007-12-19 21:29:21 UTC 
(rev 16735)
+++ trunk/freenet/src/freenet/node/CHKInsertSender.java 2007-12-19 21:29:28 UTC 
(rev 16736)
@@ -57,8 +57,7 @@
                public void run() {
                        freenet.support.Logger.OSThread.logPID(this);
                        try {
-                               bt.send(node.executor);
-                               
this.completedTransfer(bt.failedDueToOverload());
+                               this.completedTransfer(bt.send(node.executor));
                                if (pn.isRoutable() && transferSucceeded) {
                                        //synch-version: 
this.receivedNotice(waitForReceivedNotification(this));
                                        //Add ourselves as a listener for the 
longterm completion message of this transfer, then gracefully exit.


Reply via email to