Author: robert
Date: 2008-01-10 22:55:33 +0000 (Thu, 10 Jan 2008)
New Revision: 17005
Modified:
trunk/freenet/src/freenet/io/xfer/BlockReceiver.java
trunk/freenet/src/freenet/io/xfer/BlockTransmitter.java
Log:
semantics (but important semantics!)
Modified: trunk/freenet/src/freenet/io/xfer/BlockReceiver.java
===================================================================
--- trunk/freenet/src/freenet/io/xfer/BlockReceiver.java 2008-01-10
22:46:19 UTC (rev 17004)
+++ trunk/freenet/src/freenet/io/xfer/BlockReceiver.java 2008-01-10
22:55:33 UTC (rev 17005)
@@ -87,8 +87,8 @@
Logger.minor(this, "Received "+m1);
if ((m1 != null) && m1.getSpec().equals(DMT.sendAborted)) {
String desc=m1.getString(DMT.DESCRIPTION);
- if (desc.indexOf("Downstream")<0)
- desc="Downstream transmit error: "+desc;
+ if (desc.indexOf("Upstream")<0)
+ desc="Upstream transmit error: "+desc;
_prb.abort(m1.getInt(DMT.REASON), desc);
throw new
RetrievalException(m1.getInt(DMT.REASON), desc);
}
Modified: trunk/freenet/src/freenet/io/xfer/BlockTransmitter.java
===================================================================
--- trunk/freenet/src/freenet/io/xfer/BlockTransmitter.java 2008-01-10
22:46:19 UTC (rev 17004)
+++ trunk/freenet/src/freenet/io/xfer/BlockTransmitter.java 2008-01-10
22:55:33 UTC (rev 17005)
@@ -105,11 +105,11 @@
totalPackets=_prb.getNumPackets();
} catch (NotConnectedException e) {
Logger.normal(this,
"Terminating send: "+e);
- //the recieve() thread should
notice...
+ //the send() thread should
notice...
return;
} catch (AbortedException e) {
Logger.normal(this,
"Terminating send due to abort: "+e);
- //the recieve() thread should
notice...
+ //the send() thread should
notice...
return;
}
synchronized (_senderThread) {
@@ -256,8 +256,8 @@
Logger.normal(this, "AbortedException in
BlockTransfer.send():"+e);
try {
String desc=_prb.getAbortDescription();
- if (desc.indexOf("Downstream")<0)
- desc="Downstream transfer failed:
"+desc;
+ if (desc.indexOf("Upstream")<0)
+ desc="Upstream transfer failed: "+desc;
sendAborted(_prb.getAbortReason(), desc);
} catch (NotConnectedException gone) {
//ignore
