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

Make most outbound operations are cancellable

Browse Source 
- Inspired by #2214
- It actually reduces the chance of trying to marking a cancelled promise as success again, which raises an IllegalStateException.
This commit is contained in:
Trustin Lee 2014-02-10 14:04:47 -08:00
parent 838e80ed6b
commit 041d37e0c8
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
transport-rxtx/src/main/java/io/netty/channel/rxtx/RxtxChannel.java
View File

@ -133,7 +133,7 @@ public class RxtxChannel extends OioByteStreamChannel {
public void connect(
final SocketAddress remoteAddress,
final SocketAddress localAddress, final ChannelPromise promise) {
if (!ensureOpen(promise)) {
if (!promise.setUncancellable() || !ensureOpen(promise)) {
return;
}

16
transport/src/main/java/io/netty/channel/AbstractChannel.java
View File

@ -433,7 +433,7 @@ public abstract class AbstractChannel extends DefaultAttributeMap implements Cha
try {
// check if the channel is still open as it could be closed in the mean time when the register
// call was outside of the eventLoop
if (!ensureOpen(promise)) {
if (!promise.setUncancellable() || !ensureOpen(promise)) {
return;
}
doRegister();
@ -457,7 +457,7 @@ public abstract class AbstractChannel extends DefaultAttributeMap implements Cha
@Override
public final void bind(final SocketAddress localAddress, final ChannelPromise promise) {
if (!ensureOpen(promise)) {
if (!promise.setUncancellable() || !ensureOpen(promise)) {
return;
}
@ -496,6 +496,10 @@ public abstract class AbstractChannel extends DefaultAttributeMap implements Cha
@Override
public final void disconnect(final ChannelPromise promise) {
if (!promise.setUncancellable()) {
return;
}
boolean wasActive = isActive();
try {
doDisconnect();
@ -518,6 +522,10 @@ public abstract class AbstractChannel extends DefaultAttributeMap implements Cha
@Override
public final void close(final ChannelPromise promise) {
if (!promise.setUncancellable()) {
return;
}
if (inFlush0) {
invokeLater(new Runnable() {
@Override
@ -577,6 +585,10 @@ public abstract class AbstractChannel extends DefaultAttributeMap implements Cha
@Override
public final void deregister(final ChannelPromise promise) {
if (!promise.setUncancellable()) {
return;
}
if (!registered) {
promise.setSuccess();
return;

7
transport/src/main/java/io/netty/channel/oio/AbstractOioChannel.java
View File

@ -58,12 +58,7 @@ public abstract class AbstractOioChannel extends AbstractChannel {
public void connect(
final SocketAddress remoteAddress,
final SocketAddress localAddress, final ChannelPromise promise) {
if (!ensureOpen(promise)) {
return;
}
if (!promise.setUncancellable()) {
close(voidPromise());
if (!promise.setUncancellable() || !ensureOpen(promise)) {
return;
}