Fixing close() for InboundPipeline

Signed-off-by: Vacha Shah <[email protected]>
opensearch-project · Apr 5, 2024 · 2d43b1b · 2d43b1b
1 parent d7440a2
commit 2d43b1b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/server/src/main/java/org/opensearch/transport/InboundPipeline.java b/server/src/main/java/org/opensearch/transport/InboundPipeline.java
@@ -102,13 +102,13 @@ public InboundPipeline(
     @Override
     public void close() {
         isClosed = true;
-        Releasables.closeWhileHandlingException(decoder, aggregator);
-        Releasables.closeWhileHandlingException(pending);
-        pending.clear();
         if (currentHandler != null) {
             currentHandler.close();
             currentHandler = null;
         }
+        Releasables.closeWhileHandlingException(decoder, aggregator);
+        Releasables.closeWhileHandlingException(pending);
+        pending.clear();
     }
 
     public void handleBytes(TcpChannel channel, ReleasableBytesReference reference) throws IOException {

diff --git a/server/src/main/java/org/opensearch/transport/nativeprotocol/NativeInboundBytesHandler.java b/server/src/main/java/org/opensearch/transport/nativeprotocol/NativeInboundBytesHandler.java
@@ -34,10 +34,10 @@ public class NativeInboundBytesHandler implements InboundBytesHandler {
     private static final ThreadLocal<ArrayList<Object>> fragmentList = ThreadLocal.withInitial(ArrayList::new);
     private static final InboundMessage PING_MESSAGE = new InboundMessage(null, true);
 
-    private ArrayDeque<ReleasableBytesReference> pending;
-    private InboundDecoder decoder;
-    private InboundAggregator aggregator;
-    private StatsTracker statsTracker;
+    private final ArrayDeque<ReleasableBytesReference> pending;
+    private final InboundDecoder decoder;
+    private final InboundAggregator aggregator;
+    private final StatsTracker statsTracker;
     private boolean isClosed = false;
 
     public NativeInboundBytesHandler(