Backport of HTTP/2 Microbenchmark fail.

Motivation:
The backport of a6c729bdf8 failed.

Modifications:
- Make sure the interfaces are correctly implemented when backporting.

Result:
Microbenchmark compiles and runs on 4.1 branch.
This commit is contained in:
Scott Mitchell 2015-03-28 18:41:09 -07:00
parent bb059c070f
commit 2bf592c50f

View File

@ -20,7 +20,6 @@ import io.netty.channel.Channel;
import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelFuture;
import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelHandler;
import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelHandlerInvoker;
import io.netty.channel.ChannelPipeline; import io.netty.channel.ChannelPipeline;
import io.netty.channel.ChannelProgressivePromise; import io.netty.channel.ChannelProgressivePromise;
import io.netty.channel.ChannelPromise; import io.netty.channel.ChannelPromise;
@ -74,11 +73,6 @@ public abstract class EmbeddedChannelWriteReleaseHandlerContext implements Chann
return executor; return executor;
} }
@Override
public ChannelHandlerInvoker invoker() {
return null;
}
@Override @Override
public String name() { public String name() {
return HANDLER_NAME; return HANDLER_NAME;
@ -96,41 +90,21 @@ public abstract class EmbeddedChannelWriteReleaseHandlerContext implements Chann
@Override @Override
public ChannelHandlerContext fireChannelRegistered() { public ChannelHandlerContext fireChannelRegistered() {
try {
handler().channelRegistered(this);
} catch (Exception e) {
handleException(e);
}
return this; return this;
} }
@Override @Override
public ChannelHandlerContext fireChannelUnregistered() { public ChannelHandlerContext fireChannelUnregistered() {
try {
handler().channelUnregistered(this);
} catch (Exception e) {
handleException(e);
}
return this; return this;
} }
@Override @Override
public ChannelHandlerContext fireChannelActive() { public ChannelHandlerContext fireChannelActive() {
try {
handler().channelActive(this);
} catch (Exception e) {
handleException(e);
}
return this; return this;
} }
@Override @Override
public ChannelHandlerContext fireChannelInactive() { public ChannelHandlerContext fireChannelInactive() {
try {
handler().channelInactive(this);
} catch (Exception e) {
handleException(e);
}
return this; return this;
} }
@ -146,41 +120,21 @@ public abstract class EmbeddedChannelWriteReleaseHandlerContext implements Chann
@Override @Override
public ChannelHandlerContext fireUserEventTriggered(Object event) { public ChannelHandlerContext fireUserEventTriggered(Object event) {
try {
handler().userEventTriggered(this, event);
} catch (Exception e) {
handleException(e);
}
return this; return this;
} }
@Override @Override
public ChannelHandlerContext fireChannelRead(Object msg) { public ChannelHandlerContext fireChannelRead(Object msg) {
try {
handler().channelRead(this, msg);
} catch (Exception e) {
handleException(e);
}
return this; return this;
} }
@Override @Override
public ChannelHandlerContext fireChannelReadComplete() { public ChannelHandlerContext fireChannelReadComplete() {
try {
handler().channelReadComplete(this);
} catch (Exception e) {
handleException(e);
}
return this; return this;
} }
@Override @Override
public ChannelHandlerContext fireChannelWritabilityChanged() { public ChannelHandlerContext fireChannelWritabilityChanged() {
try {
handler().channelWritabilityChanged(this);
} catch (Exception e) {
handleException(e);
}
return this; return this;
} }