Merge pull request #2111 from ballerina-platform/test

Remove the eviction timer after HTTP/1.1 downgrade

native/src/main/java/io/ballerina/stdlib/http/transport/contractimpl/listener/HttpServerChannelInitializer.java

@@ -62,6 +62,7 @@
 import java.io.IOException;
 import java.security.KeyStoreException;
 import java.security.cert.CertificateException;
+import java.util.Objects;
 import java.util.Timer;
 import java.util.TimerTask;
 import java.util.concurrent.BlockingQueue;
@@ -115,6 +116,7 @@ public class HttpServerChannelInitializer extends ChannelInitializer<SocketChann
     private long minIdleTimeInStaleState;
     private long timeBetweenStaleEviction;
     private final BlockingQueue<Http2SourceHandler> http2StaleSourceHandlers = new LinkedBlockingQueue<>();
+    private Timer timer;
 
     @Override
     public void initChannel(SocketChannel ch) throws Exception {
@@ -484,7 +486,10 @@ void setAllChannels(ChannelGroup allChannels, ChannelGroup listenerChannels) {
     }
 
     private void initiateHttp2ConnectionEvictionTask() {
-        Timer timer = new Timer(true);
+        if (Objects.nonNull(timer)) {
+            return;
+        }
+        timer = new Timer(true);
         TimerTask timerTask = new TimerTask() {
             @Override
             public void run() {
@@ -507,4 +512,10 @@ public void removeChannelAndEvict(Http2SourceHandler http2SourceHandler) {
         };
         timer.schedule(timerTask, timeBetweenStaleEviction, timeBetweenStaleEviction);
     }
+
+    public void cancelStaleEvictionTask() {
+        if (Objects.nonNull(timer)) {
+            timer.cancel();
+        }
+    }
 }

native/src/main/java/io/ballerina/stdlib/http/transport/contractimpl/listener/http2/Http2ToHttpFallbackHandler.java

@@ -42,6 +42,7 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) {
         ChannelPipeline pipeline = ctx.pipeline();
         safelyRemoveHandlers(pipeline, Constants.HTTP2_UPGRADE_HANDLER);
         serverChannelInitializer.configureHttpPipeline(pipeline, Constants.HTTP2_CLEARTEXT_PROTOCOL);
+        serverChannelInitializer.cancelStaleEvictionTask();
         pipeline.remove(this);
         ctx.fireChannelActive();
         ctx.fireChannelRead(msg);