Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CANCELING.onCanceled() never triggered when being stopped before connecting #33

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

CANCELING.onCanceled() never triggered when being stopped before connecting #33

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion hawtdispatch-transport/src/main/java/org/fusesource/hawtdispatch/transport/TcpTransport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,8 @@ void add(Task onCompleted) {
}
void onCanceled() {
trace("CANCELING.onCanceled");
remaining--;
// it could be zero when neither readSource nor writeSource has been initialized yet
if (remaining > 0) remaining--;
if( remaining!=0 ) {
return;
}
Expand Down Expand Up @@ -463,6 +464,10 @@ public void run() {
public void run() {
// No need to complete if we have been canceled.
if( ! socketState.is(CONNECTING.class) ) {
// fire onCanceled() for CANCELLING state. otherwise, it will never be triggered
if ( socketState.is(CANCELING.class)) {
socketState.onCanceled();
}
return;
}
try {
Expand Down