Revert "Fix #1075: DefaultChannelHandlerContext.fireChannelSuspended and fireInboundBufferUpdated do not work correctly if handlers with EventExecutor are added or removed from pipeline."

This reverts commit 273948055a, which is
incorrect.

- Related: #1075
This commit is contained in:
Trustin Lee 2013-04-22 16:58:54 +09:00
parent ab685de7a3
commit f979c17b67

View File

@ -877,15 +877,8 @@ final class DefaultChannelHandlerContext extends DefaultAttributeMap implements
next.invokeInboundBufferUpdatedTask = task = new Runnable() { next.invokeInboundBufferUpdatedTask = task = new Runnable() {
@Override @Override
public void run() { public void run() {
if (pipeline.isInboundShutdown()) { if (!pipeline.isInboundShutdown()) {
return;
}
DefaultChannelHandlerContext nextInbound = findContextInbound();
if (nextInbound == next) {
next.invokeInboundBufferUpdated(); next.invokeInboundBufferUpdated();
} else {
// Pipeline changed since the task was submitted; try again.
fireInboundBufferUpdated0(nextInbound);
} }
} }
}; };
@ -949,12 +942,7 @@ final class DefaultChannelHandlerContext extends DefaultAttributeMap implements
next.invokeChannelReadSuspendedTask = task = new Runnable() { next.invokeChannelReadSuspendedTask = task = new Runnable() {
@Override @Override
public void run() { public void run() {
if (findContextInbound() == next) { next.invokeChannelReadSuspended();
next.invokeChannelReadSuspended();
} else {
// Pipeline changed since the task was submitted; try again.
fireChannelReadSuspended();
}
} }
}; };
} }