[freenet-cvs] r13453 - in trunk/freenet/src/freenet: io/comm io/xfer node

[t...@freenetproject.org]

Author: toad
Date: 2007-06-01 19:43:36 +0000 (Fri, 01 Jun 2007)
New Revision: 13453

Modified:
   trunk/freenet/src/freenet/io/comm/MessageFilter.java
   trunk/freenet/src/freenet/io/xfer/PartiallyReceivedBulk.java
   trunk/freenet/src/freenet/node/PeerNode.java
Log:
Getting there...

Modified: trunk/freenet/src/freenet/io/comm/MessageFilter.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/MessageFilter.java        2007-06-01 
19:25:44 UTC (rev 13452)
+++ trunk/freenet/src/freenet/io/comm/MessageFilter.java        2007-06-01 
19:43:36 UTC (rev 13453)
@@ -118,7 +118,7 @@
        }

        public MessageFilter or(MessageFilter or) {
-               if((or != null) && (_or != null)) {
+               if((or != null) && (_or != null) && or != _or) {
                        // FIXME maybe throw? this is almost certainly a bug, 
and a nasty one too!
                        Logger.error(this, "or() replacement: "+_or+" -> "+or, 
new Exception("error"));
                }

Modified: trunk/freenet/src/freenet/io/xfer/PartiallyReceivedBulk.java
===================================================================
--- trunk/freenet/src/freenet/io/xfer/PartiallyReceivedBulk.java        
2007-06-01 19:25:44 UTC (rev 13452)
+++ trunk/freenet/src/freenet/io/xfer/PartiallyReceivedBulk.java        
2007-06-01 19:43:36 UTC (rev 13453)
@@ -101,7 +101,7 @@
        void received(int blockNum, byte[] data, int offset, int length) {
                BulkTransmitter[] notifyBTs;
                long fileOffset = (long)blockNum * (long)blockSize;
-               int bs = (int) Math.max(blockSize, size - fileOffset);
+               int bs = (int) Math.min(blockSize, size - fileOffset);
                if(length < bs) {
                        String err = "Data too short! Should be "+bs+" actually 
"+length;
                        Logger.error(this, err+" for "+this);

Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java        2007-06-01 19:25:44 UTC 
(rev 13452)
+++ trunk/freenet/src/freenet/node/PeerNode.java        2007-06-01 19:43:36 UTC 
(rev 13453)
@@ -3279,7 +3279,7 @@
                                                Logger.minor(this, "Sending 
file");
                                        try {
                                                if(!transmitter.send()) {
-                                                       String err = "Failed to 
send "+this;
+                                                       String err = "Failed to 
send "+uid+" for "+FileOffer.this;
                                                        Logger.error(this, err);
                                                        System.err.println(err);
                                                }