andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of github.com:netty/netty

Browse Source
This commit is contained in:
Norman Maurer 2012-05-19 17:08:59 +02:00
commit 3d715a4967
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
handler/src/main/java/io/netty/handler/traffic/AbstractTrafficShapingHandler.java
View File

@ -359,7 +359,7 @@ public abstract class AbstractTrafficShapingHandler extends
// Time is too short, so just lets continue
return 0;
}
return bytes * 1000 / limit - interval;
return ((bytes * 1000 / limit - interval)/10)*10;
}
@Override

7
handler/src/main/java/io/netty/handler/traffic/TrafficCounter.java
View File

@ -248,9 +248,10 @@ public class TrafficCounter {
* @param newcheckInterval
*/
public void configure(long newcheckInterval) {
if (checkInterval.get() != newcheckInterval) {
checkInterval.set(newcheckInterval);
if (newcheckInterval <= 0) {
long newInterval = (newcheckInterval/10)*10;
if (checkInterval.get() != newInterval) {
checkInterval.set(newInterval);
if (newInterval <= 0) {
stop();
// No more active monitoring
lastTime.set(System.currentTimeMillis());