[freenet-cvs] r16998 - trunk/freenet/src/freenet/io/xfer

[rob...@freenetproject.org]

Author: robert
Date: 2008-01-10 19:32:26 +0000 (Thu, 10 Jan 2008)
New Revision: 16998

Modified:
   trunk/freenet/src/freenet/io/xfer/BlockTransmitter.java
Log:
Report original cause (marked 'downstream') / fix build


Modified: trunk/freenet/src/freenet/io/xfer/BlockTransmitter.java
===================================================================
--- trunk/freenet/src/freenet/io/xfer/BlockTransmitter.java     2008-01-10 
19:23:00 UTC (rev 16997)
+++ trunk/freenet/src/freenet/io/xfer/BlockTransmitter.java     2008-01-10 
19:32:26 UTC (rev 16998)
@@ -209,7 +209,10 @@
                                                _sendComplete = true;
                                                _senderThread.notifyAll();      
                                        }
-                                       sendAborted(_prb.getAbortedReason(), 
"Downstream transfer failed");
+                                       String desc=_prb.getAbortDescription();
+                                       if (!desc.contains("Downstream"))
+                                               desc="Downstream transfer 
failed: "+desc;
+                                       sendAborted(_prb.getAbortReason(), 
desc);
                                        return false;
                                }
                                Message msg;
@@ -293,7 +296,10 @@
                } catch (AbortedException e) {
                        Logger.normal(this, "AbortedException in 
BlockTransfer.send():"+e);
                        try {
-                               
sendAborted(RetrievalException.CANCELLED_BY_RECEIVER, "Downstream transfer 
failed");
+                               String desc=_prb.getAbortDescription();
+                               if (!desc.contains("Downstream"))
+                                       desc="Downstream transfer failed: 
"+desc;
+                               sendAborted(_prb.getAbortReason(), desc);
                        } catch (NotConnectedException gone) {
                                //ignore
                        }