From 2bf592c50fccda7d8cda2e5f1b86142a9b2b8c34 Mon Sep 17 00:00:00 2001 From: Scott Mitchell Date: Sat, 28 Mar 2015 18:41:09 -0700 Subject: [PATCH] Backport of HTTP/2 Microbenchmark fail. Motivation: The backport of a6c729bdf82abd4627cb1b5d90bfe320377f6282 failed. Modifications: - Make sure the interfaces are correctly implemented when backporting. Result: Microbenchmark compiles and runs on 4.1 branch. --- ...ddedChannelWriteReleaseHandlerContext.java | 46 ------------------- 1 file changed, 46 deletions(-) diff --git a/microbench/src/test/java/io/netty/microbench/channel/EmbeddedChannelWriteReleaseHandlerContext.java b/microbench/src/test/java/io/netty/microbench/channel/EmbeddedChannelWriteReleaseHandlerContext.java index c88d532713..b8984ea488 100644 --- a/microbench/src/test/java/io/netty/microbench/channel/EmbeddedChannelWriteReleaseHandlerContext.java +++ b/microbench/src/test/java/io/netty/microbench/channel/EmbeddedChannelWriteReleaseHandlerContext.java @@ -20,7 +20,6 @@ import io.netty.channel.Channel; import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelHandlerContext; -import io.netty.channel.ChannelHandlerInvoker; import io.netty.channel.ChannelPipeline; import io.netty.channel.ChannelProgressivePromise; import io.netty.channel.ChannelPromise; @@ -74,11 +73,6 @@ public abstract class EmbeddedChannelWriteReleaseHandlerContext implements Chann return executor; } - @Override - public ChannelHandlerInvoker invoker() { - return null; - } - @Override public String name() { return HANDLER_NAME; @@ -96,41 +90,21 @@ public abstract class EmbeddedChannelWriteReleaseHandlerContext implements Chann @Override public ChannelHandlerContext fireChannelRegistered() { - try { - handler().channelRegistered(this); - } catch (Exception e) { - handleException(e); - } return this; } @Override public ChannelHandlerContext fireChannelUnregistered() { - try { - handler().channelUnregistered(this); - } catch (Exception e) { - handleException(e); - } return this; } @Override public ChannelHandlerContext fireChannelActive() { - try { - handler().channelActive(this); - } catch (Exception e) { - handleException(e); - } return this; } @Override public ChannelHandlerContext fireChannelInactive() { - try { - handler().channelInactive(this); - } catch (Exception e) { - handleException(e); - } return this; } @@ -146,41 +120,21 @@ public abstract class EmbeddedChannelWriteReleaseHandlerContext implements Chann @Override public ChannelHandlerContext fireUserEventTriggered(Object event) { - try { - handler().userEventTriggered(this, event); - } catch (Exception e) { - handleException(e); - } return this; } @Override public ChannelHandlerContext fireChannelRead(Object msg) { - try { - handler().channelRead(this, msg); - } catch (Exception e) { - handleException(e); - } return this; } @Override public ChannelHandlerContext fireChannelReadComplete() { - try { - handler().channelReadComplete(this); - } catch (Exception e) { - handleException(e); - } return this; } @Override public ChannelHandlerContext fireChannelWritabilityChanged() { - try { - handler().channelWritabilityChanged(this); - } catch (Exception e) { - handleException(e); - } return this; }