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

Simplify the validation logic proposed in 25f96b1644

Browse Source
This commit is contained in:
Trustin Lee 2013-07-23 13:47:43 +09:00
parent 35802207e1
commit d4aa5b53d6
2 changed files with 8 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
transport/src/main/java/io/netty/channel/DefaultChannelHandlerContext.java
View File

@ -812,7 +812,7 @@ final class DefaultChannelHandlerContext extends DefaultAttributeMap implements
return new FailedChannelFuture(channel(), executor(), cause); return new FailedChannelFuture(channel(), executor(), cause);
} }
private void validatePromise(ChannelPromise promise, boolean allowUnsafe) { private void validatePromise(ChannelPromise promise, boolean allowVoidPromise) {
if (promise == null) { if (promise == null) {
throw new NullPointerException("promise"); throw new NullPointerException("promise");
} }
@ -821,32 +821,24 @@ final class DefaultChannelHandlerContext extends DefaultAttributeMap implements
throw new IllegalArgumentException("promise already done: " + promise); throw new IllegalArgumentException("promise already done: " + promise);
} }
// check if the promise is of type DefaultChannelPromise and if so check if its validated already.
DefaultChannelPromise p = null;
if (promise instanceof DefaultChannelPromise) {
p = (DefaultChannelPromise) promise;
if (p.isValidated()) {
return;
}
}
if (promise.channel() != channel()) { if (promise.channel() != channel()) {
throw new IllegalArgumentException(String.format( throw new IllegalArgumentException(String.format(
"promise.channel does not match: %s (expected: %s)", promise.channel(), channel())); "promise.channel does not match: %s (expected: %s)", promise.channel(), channel()));
} }
if (!allowUnsafe && promise instanceof VoidChannelPromise) {
if (promise.getClass() == DefaultChannelPromise.class) {
return;
}
if (!allowVoidPromise && promise instanceof VoidChannelPromise) {
throw new IllegalArgumentException( throw new IllegalArgumentException(
StringUtil.simpleClassName(VoidChannelPromise.class) + " not allowed for this operation"); StringUtil.simpleClassName(VoidChannelPromise.class) + " not allowed for this operation");
} }
if (promise instanceof AbstractChannel.CloseFuture) { if (promise instanceof AbstractChannel.CloseFuture) {
throw new IllegalArgumentException( throw new IllegalArgumentException(
StringUtil.simpleClassName(AbstractChannel.CloseFuture.class) + " not allowed in a pipeline"); StringUtil.simpleClassName(AbstractChannel.CloseFuture.class) + " not allowed in a pipeline");
} }
if (p != null) {
// mark as validated
p.validated();
}
} }
private DefaultChannelHandlerContext findContextInbound() { private DefaultChannelHandlerContext findContextInbound() {

9
transport/src/main/java/io/netty/channel/DefaultChannelPromise.java
View File

@ -29,7 +29,6 @@ public class DefaultChannelPromise extends DefaultPromise<Void> implements Chann
private final Channel channel; private final Channel channel;
private long checkpoint; private long checkpoint;
private boolean validated;
/** /**
* Creates a new instance. * Creates a new instance.
@ -158,12 +157,4 @@ public class DefaultChannelPromise extends DefaultPromise<Void> implements Chann
super.checkDeadLock(); super.checkDeadLock();
} }
} }
final boolean isValidated() {
return validated;
}
final void validated() {
validated = true;
}
} }