Author: robert
Date: 2008-01-10 19:40:05 +0000 (Thu, 10 Jan 2008)
New Revision: 16999
Modified:
trunk/freenet/src/freenet/io/xfer/BlockReceiver.java
trunk/freenet/src/freenet/io/xfer/BlockTransmitter.java
Log:
fix build, and other part of r16998
Modified: trunk/freenet/src/freenet/io/xfer/BlockReceiver.java
===================================================================
--- trunk/freenet/src/freenet/io/xfer/BlockReceiver.java 2008-01-10
19:32:26 UTC (rev 16998)
+++ trunk/freenet/src/freenet/io/xfer/BlockReceiver.java 2008-01-10
19:40:05 UTC (rev 16999)
@@ -86,7 +86,10 @@
if(logMINOR)
Logger.minor(this, "Received "+m1);
if ((m1 != null) && m1.getSpec().equals(DMT.sendAborted)) {
- _prb.abort(m1.getInt(DMT.REASON),
m1.getString(DMT.DESCRIPTION));
+ String desc=m1.getString(DMT.DESCRIPTION);
+ if (desc.indexOf("Downstream")<0)
+ desc="Downstream transmit error: "+desc;
+ _prb.abort(m1.getInt(DMT.REASON), desc);
throw new
RetrievalException(m1.getInt(DMT.REASON), m1.getString(DMT.DESCRIPTION));
}
if ((m1 != null) &&
(m1.getSpec().equals(DMT.packetTransmit))) {
Modified: trunk/freenet/src/freenet/io/xfer/BlockTransmitter.java
===================================================================
--- trunk/freenet/src/freenet/io/xfer/BlockTransmitter.java 2008-01-10
19:32:26 UTC (rev 16998)
+++ trunk/freenet/src/freenet/io/xfer/BlockTransmitter.java 2008-01-10
19:40:05 UTC (rev 16999)
@@ -210,7 +210,7 @@
_senderThread.notifyAll();
}
String desc=_prb.getAbortDescription();
- if (!desc.contains("Downstream"))
+ if (desc.indexOf("Downstream")<0)
desc="Downstream transfer
failed: "+desc;
sendAborted(_prb.getAbortReason(),
desc);
return false;
@@ -297,7 +297,7 @@
Logger.normal(this, "AbortedException in
BlockTransfer.send():"+e);
try {
String desc=_prb.getAbortDescription();
- if (!desc.contains("Downstream"))
+ if (desc.indexOf("Downstream")<0)
desc="Downstream transfer failed:
"+desc;
sendAborted(_prb.getAbortReason(), desc);
} catch (NotConnectedException gone) {
