From 5e4ddad9a9ac6679c2f3bf4450c949d19dc3696d Mon Sep 17 00:00:00 2001
From: Duo Zhang <zhangduo@apache.org>
Date: Thu, 28 Jul 2022 17:20:13 +0800
Subject: [PATCH] HBASE-27185 Addendum fix TestShadeSaslAuthenticationProvider

---
 .../org/apache/hadoop/hbase/ipc/NettyRpcConnection.java    | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/NettyRpcConnection.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/NettyRpcConnection.java
index 2e6bd1025af..c4e474e0694 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/NettyRpcConnection.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/NettyRpcConnection.java
@@ -218,8 +218,9 @@ class NettyRpcConnection extends RpcConnection {
       failInit(ch, e);
       return;
     }
-    ch.pipeline().addFirst(new SaslChallengeDecoder(), saslHandler);
-    NettyFutureUtils.consume(saslPromise.addListener(new FutureListener<Boolean>() {
+    ch.pipeline().addFirst("SaslDecoder", new SaslChallengeDecoder()).addAfter("SaslDecoder",
+      "SaslHandler", saslHandler);
+    NettyFutureUtils.addListener(saslPromise, new FutureListener<Boolean>() {
 
       @Override
       public void operationComplete(Future<Boolean> future) throws Exception {
@@ -266,7 +267,7 @@ class NettyRpcConnection extends RpcConnection {
           failInit(ch, toIOE(error));
         }
       }
-    }));
+    });
   }
 
   private void connect() throws UnknownHostException {