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

[t...@freenetproject.org]

Author: toad
Date: 2006-03-22 21:57:37 +0000 (Wed, 22 Mar 2006)
New Revision: 8289

Modified:
   trunk/freenet/src/freenet/io/xfer/BlockTransmitter.java
   trunk/freenet/src/freenet/node/Version.java
Log:
555: Fix bandwidth limiter. (Maybe).

Modified: trunk/freenet/src/freenet/io/xfer/BlockTransmitter.java
===================================================================
--- trunk/freenet/src/freenet/io/xfer/BlockTransmitter.java     2006-03-22 
20:22:24 UTC (rev 8288)
+++ trunk/freenet/src/freenet/io/xfer/BlockTransmitter.java     2006-03-22 
21:57:37 UTC (rev 8289)
@@ -251,6 +251,7 @@

                                // Get the current inter-packet delay
                                long delay = throttle.getDelay();
+                               Logger.minor(this, "Throttle delay: "+delay);

                                while(true) {

@@ -309,7 +310,7 @@

                                        long now = nowNS / (1000 * 1000);

-                                       while(nowNS < endTime) {
+                                       while(now < endTime) {
                                                synchronized(_senderThread) {
                                                        if(_sendComplete)
                                                                return true;

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-03-22 20:22:24 UTC (rev 
8288)
+++ trunk/freenet/src/freenet/node/Version.java 2006-03-22 21:57:37 UTC (rev 
8289)
@@ -20,7 +20,7 @@
        public static final String protocolVersion = "1.0";

        /** The build number of the current revision */
-       private static final int buildNumber = 554;
+       private static final int buildNumber = 555;

        /** Oldest build of Fred we will talk to */
        private static final int lastGoodBuild = 507;