Merge pull request OpenLiberty#14 from isaacrivriv/fix-netty-wsat-fats

Added fix for virtual host difference between chfw and netty
mrsaldana · Apr 12, 2024 · 803cc36 · 803cc36
2 parents aa8fb66 + a01cb4f
commit 803cc36
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/dev/com.ibm.ws.transport.http/src/com/ibm/ws/http/netty/NettyChain.java b/dev/com.ibm.ws.transport.http/src/com/ibm/ws/http/netty/NettyChain.java
@@ -280,6 +280,10 @@ public synchronized void startNettyChannel() {
                 cancelToken.set(false);
 
                 channelFuture = nettyFramework.start(bootstrap, info.getHost(), info.getPort(), this::channelFutureHandler, cancelToken);
+
+                VirtualHostMap.notifyStarted(owner, () -> currentConfig.getResolvedHost(), currentConfig.getConfigPort(), isHttps);
+                String topic = owner.getEventTopic() + HttpServiceConstants.ENDPOINT_STARTED;
+                postEvent(topic, currentConfig, null);
 
 
                 //channelFuture.get(10, TimeUnit.SECONDS);
@@ -299,13 +303,14 @@ public synchronized void startNettyChannel() {
     private void channelFutureHandler(ChannelFuture future) {
         if(future.isSuccess()) {
             serverChannel = future.channel();
+            state.set(ChainState.STARTED);
 
             MSP.log("Channel is now active and listening on port " + getActivePort());
-            VirtualHostMap.notifyStarted(owner, () -> currentConfig.getResolvedHost(), currentConfig.getConfigPort(), isHttps);
-            String topic = owner.getEventTopic() + HttpServiceConstants.ENDPOINT_STARTED;
-            postEvent(topic, currentConfig, null);
+//            VirtualHostMap.notifyStarted(owner, () -> currentConfig.getResolvedHost(), currentConfig.getConfigPort(), isHttps);
+//            String topic = owner.getEventTopic() + HttpServiceConstants.ENDPOINT_STARTED;
+//            postEvent(topic, currentConfig, null);
 
-            state.set(ChainState.STARTED);
+//            state.set(ChainState.STARTED);
 
         } else {
             MSP.log("ChannelFutureHandler -> Failed to bind to port: " + future.cause());