Author: toad
Date: 2009-01-16 14:31:16 +0000 (Fri, 16 Jan 2009)
New Revision: 25083
Modified:
trunk/freenet/src/freenet/io/xfer/BlockReceiver.java
trunk/freenet/src/freenet/node/RequestSender.java
Log:
Delete tookTooLong code
Modified: trunk/freenet/src/freenet/io/xfer/BlockReceiver.java
===================================================================
--- trunk/freenet/src/freenet/io/xfer/BlockReceiver.java 2009-01-16
14:23:35 UTC (rev 25082)
+++ trunk/freenet/src/freenet/io/xfer/BlockReceiver.java 2009-01-16
14:31:16 UTC (rev 25083)
@@ -67,7 +67,6 @@
boolean sentAborted;
private MessageFilter discardFilter;
private long discardEndTime;
- private boolean tookTooLong;
private boolean senderAborted;
// private final boolean _doTooLong;
@@ -267,10 +266,6 @@
// Ignore
}
- public synchronized boolean tookTooLong() {
- return tookTooLong;
- }
-
public synchronized boolean senderAborted() {
return senderAborted;
}
Modified: trunk/freenet/src/freenet/node/RequestSender.java
===================================================================
--- trunk/freenet/src/freenet/node/RequestSender.java 2009-01-16 14:23:35 UTC
(rev 25082)
+++ trunk/freenet/src/freenet/node/RequestSender.java 2009-01-16 14:31:16 UTC
(rev 25083)
@@ -275,8 +275,7 @@
try {
if(logMINOR) Logger.minor(this,
"Receiving data");
byte[] data = br.receive();
- if(!br.tookTooLong())
- pn.transferSuccess();
+ pn.transferSuccess();
if(logMINOR) Logger.minor(this,
"Received data");
// Received data
try {
@@ -298,8 +297,7 @@
Logger.normal(this, "Transfer for offer failed
("+e.getReason()+"/"+RetrievalException.getErrString(e.getReason())+"): "+e+"
from "+pn, e);
finish(GET_OFFER_TRANSFER_FAILED, pn,
true);
// Backoff here anyway - the node
really ought to have it!
- if(!br.tookTooLong())
-
pn.transferFailed("RequestSenderGetOfferedTransferFailed");
+
pn.transferFailed("RequestSenderGetOfferedTransferFailed");
offers.deleteLastOffer();
node.nodeStats.failedBlockReceive(false, false, false);
return;
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
