[freenet-cvs] r12355 - trunk/freenet/src/freenet/node

[t...@freenetproject.org]

Author: toad
Date: 2007-03-24 22:56:02 +0000 (Sat, 24 Mar 2007)
New Revision: 12355

Modified:
   trunk/freenet/src/freenet/node/Node.java
Log:
bwlimit fixes

Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java    2007-03-24 22:49:07 UTC (rev 
12354)
+++ trunk/freenet/src/freenet/node/Node.java    2007-03-24 22:56:02 UTC (rev 
12355)
@@ -889,13 +889,13 @@
                                                        inputBandwidthLimit = 
ibwLimit;
                                                        if(ibwLimit == -1) {
                                                                
inputLimitDefault = true;
-                                                               ibwLimit = 
(int) ((1000L * 1000L * 1000L) / outputThrottle.getNanosPerTick()) * 4;
+                                                               ibwLimit = 
outputBandwidthLimit * 4;
                                                        } else {
+                                                               if(ibwLimit <= 
0) throw new InvalidConfigValueException("Bandwidth limit must be positive or 
-1");
                                                                
inputLimitDefault = false;
                                                                ibwLimit = 
ibwLimit * 4 / 5; // fudge factor; take into account non-request activity
                                                        }
                                                }
-                                               if(ibwLimit <= 0) throw new 
InvalidConfigValueException("Bandwidth limit must be positive or -1");
                                                
nodeStats.setInputLimit(ibwLimit);
                                        }
                });