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

Merge pull request #346 from fredericBregier/master

Browse Source 
Proposal to fix 1rst issue presented in #345
This commit is contained in:
Frédéric Brégier 2012-05-19 07:56:38 -07:00
commit 5e48c50589
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 // Time is too short, so just lets continue
return 0; return 0;
} }
return bytes * 1000 / limit - interval; return ((bytes * 1000 / limit - interval)/10)*10;
} }
@Override @Override

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

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