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

Merge pull request #425 from Massive-Dynamics/timeout-unsuccessful-cancel

Browse Source 
Change Timeout.cancel() to return a boolean value
This commit is contained in:
Norman Maurer 2012-06-29 05:08:46 -07:00
commit 53fb5165c9
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/src/main/java/io/netty/util/HashedWheelTimer.java
View File

@ -501,13 +501,13 @@ public class HashedWheelTimer implements Timer {
}
@Override
public void cancel() {
public boolean cancel() {
if (!state.compareAndSet(ST_INIT, ST_CANCELLED)) {
// TODO return false
return;
return false;
}
wheel[stopIndex].remove(this);
return true;
}
@Override

10
common/src/main/java/io/netty/util/Timeout.java
View File

@ -44,9 +44,11 @@ public interface Timeout {
boolean isCancelled();
/**
* Cancels the {@link TimerTask} associated with this handle. It the
* task has been executed or cancelled already, it will return with no
* side effect.
* Attempts to cancel the {@link TimerTask} associated with this handle.
* If the task has been executed or cancelled already, it will return with
* no side effect.
*
* @return True if the cancellation completed successfully, otherwise false
*/
void cancel();
boolean cancel();
}