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

Synchronized between 4.1 and master

Browse Source 
Motivation:

4 and 5 were diverged long time ago and we recently reverted some of the
early commits in master.  We must make sure 4.1 and master are not very
different now.

Modification:

Small adjustments to match up branches

Result:

4.1 and master got closer.
This commit is contained in:
Norman Maurer 2014-04-24 21:04:20 +02:00
parent db3709e652
commit a2f1f21612
1 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
transport/src/main/java/io/netty/channel/DefaultChannelPipeline.java
View File

@ -537,7 +537,7 @@ final class DefaultChannelPipeline implements ChannelPipeline {
} }
} }
private void callHandlerAdded(final ChannelHandlerContext ctx) { private void callHandlerAdded(final DefaultChannelHandlerContext ctx) {
if (ctx.channel().isRegistered() && !ctx.executor().inEventLoop()) { if (ctx.channel().isRegistered() && !ctx.executor().inEventLoop()) {
ctx.executor().execute(new Runnable() { ctx.executor().execute(new Runnable() {
@Override @Override
@ -550,13 +550,13 @@ final class DefaultChannelPipeline implements ChannelPipeline {
callHandlerAdded0(ctx); callHandlerAdded0(ctx);
} }
private void callHandlerAdded0(final ChannelHandlerContext ctx) { private void callHandlerAdded0(final DefaultChannelHandlerContext ctx) {
try { try {
ctx.handler().handlerAdded(ctx); ctx.handler().handlerAdded(ctx);
} catch (Throwable t) { } catch (Throwable t) {
boolean removed = false; boolean removed = false;
try { try {
remove((DefaultChannelHandlerContext) ctx); remove(ctx);
removed = true; removed = true;
} catch (Throwable t2) { } catch (Throwable t2) {
if (logger.isWarnEnabled()) { if (logger.isWarnEnabled()) {
@ -934,7 +934,7 @@ final class DefaultChannelPipeline implements ChannelPipeline {
} }
@Override @Override
public ChannelFuture deregister(final ChannelPromise promise) { public ChannelFuture deregister(ChannelPromise promise) {
return tail.deregister(promise); return tail.deregister(promise);
} }
@ -1046,7 +1046,7 @@ final class DefaultChannelPipeline implements ChannelPipeline {
public void channelReadComplete(ChannelHandlerContext ctx) throws Exception { } public void channelReadComplete(ChannelHandlerContext ctx) throws Exception { }
} }
static final class HeadHandler implements ChannelOutboundHandler { static final class HeadHandler extends ChannelOutboundHandlerAdapter {
private final Unsafe unsafe; private final Unsafe unsafe;
@ -1054,16 +1054,6 @@ final class DefaultChannelPipeline implements ChannelPipeline {
this.unsafe = unsafe; this.unsafe = unsafe;
} }
@Override
public void handlerAdded(ChannelHandlerContext ctx) throws Exception {
// NOOP
}
@Override
public void handlerRemoved(ChannelHandlerContext ctx) throws Exception {
// NOOP
}
@Override @Override
public void bind( public void bind(
ChannelHandlerContext ctx, SocketAddress localAddress, ChannelPromise promise) ChannelHandlerContext ctx, SocketAddress localAddress, ChannelPromise promise)
@ -1090,7 +1080,6 @@ final class DefaultChannelPipeline implements ChannelPipeline {
} }
@Override @Override
@Deprecated
public void deregister(ChannelHandlerContext ctx, ChannelPromise promise) throws Exception { public void deregister(ChannelHandlerContext ctx, ChannelPromise promise) throws Exception {
unsafe.deregister(promise); unsafe.deregister(promise);
} }
@ -1109,10 +1098,5 @@ final class DefaultChannelPipeline implements ChannelPipeline {
public void flush(ChannelHandlerContext ctx) throws Exception { public void flush(ChannelHandlerContext ctx) throws Exception {
unsafe.flush(); unsafe.flush();
} }
@Override
public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
ctx.fireExceptionCaught(cause);
}
} }
} }