From 2771ac7fb5c090cb1c46dd0373090cd73d142234 Mon Sep 17 00:00:00 2001 From: Norman Maurer Date: Fri, 2 Sep 2016 07:55:50 +0200 Subject: [PATCH] [#5712] Allow clients to override userDefinedWritabilityIndex from AbstractTrafficShapingHandler Motivation: AbstractTrafficShapingHandler has a package-private method called "userDefinedWritabilityIndex()" which a user may need to override if two sub-classes wants to be used in the ChannelPipeline. Modifications: Mark method protected. Result: Easier to extend AbstractTrafficShapingHandler. --- .../io/netty/handler/traffic/AbstractTrafficShapingHandler.java | 2 +- .../handler/traffic/GlobalChannelTrafficShapingHandler.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/handler/src/main/java/io/netty/handler/traffic/AbstractTrafficShapingHandler.java b/handler/src/main/java/io/netty/handler/traffic/AbstractTrafficShapingHandler.java index 9cff40f0cef..fb4cdce3e22 100644 --- a/handler/src/main/java/io/netty/handler/traffic/AbstractTrafficShapingHandler.java +++ b/handler/src/main/java/io/netty/handler/traffic/AbstractTrafficShapingHandler.java @@ -145,7 +145,7 @@ void setTrafficCounter(TrafficCounter newTrafficCounter) { * for GlobalChannel TSH it is defined as * {@value #GLOBALCHANNEL_DEFAULT_USER_DEFINED_WRITABILITY_INDEX}. */ - int userDefinedWritabilityIndex() { + protected int userDefinedWritabilityIndex() { if (this instanceof GlobalChannelTrafficShapingHandler) { return GLOBALCHANNEL_DEFAULT_USER_DEFINED_WRITABILITY_INDEX; } else if (this instanceof GlobalTrafficShapingHandler) { diff --git a/handler/src/main/java/io/netty/handler/traffic/GlobalChannelTrafficShapingHandler.java b/handler/src/main/java/io/netty/handler/traffic/GlobalChannelTrafficShapingHandler.java index 91a68f0a0e0..8b257eb7f05 100644 --- a/handler/src/main/java/io/netty/handler/traffic/GlobalChannelTrafficShapingHandler.java +++ b/handler/src/main/java/io/netty/handler/traffic/GlobalChannelTrafficShapingHandler.java @@ -156,7 +156,7 @@ void createGlobalTrafficCounter(ScheduledExecutorService executor) { } @Override - int userDefinedWritabilityIndex() { + protected int userDefinedWritabilityIndex() { return AbstractTrafficShapingHandler.GLOBALCHANNEL_DEFAULT_USER_DEFINED_WRITABILITY_INDEX; }