Simplify Deflate* implementations by using EmbeddedChannel.finishAndR…

…eleaseAll() (#9808) Motivation: We can simplify the code by just using finishAndReleaseAll() Modifications: Remove some code and simplify Result: Cleaner code
netty · Nov 27, 2019 · f2596fd · f2596fd
1 parent 621af5c
commit f2596fd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 20 deletions.
diff --git a/...in/java/io/netty/handler/codec/http/websocketx/extensions/compression/DeflateDecoder.java b/...in/java/io/netty/handler/codec/http/websocketx/extensions/compression/DeflateDecoder.java
@@ -150,16 +150,7 @@ private ByteBuf decompressContent(ChannelHandlerContext ctx, WebSocketFrame msg)
     private void cleanup() {
         if (decoder != null) {
             // Clean-up the previous encoder if not cleaned up correctly.
-            if (decoder.finish()) {
-                for (;;) {
-                    ByteBuf buf = decoder.readOutbound();
-                    if (buf == null) {
-                        break;
-                    }
-                    // Release the buffer
-                    buf.release();
-                }
-            }
+            decoder.finishAndReleaseAll();
             decoder = null;
         }
     }

diff --git a/...in/java/io/netty/handler/codec/http/websocketx/extensions/compression/DeflateEncoder.java b/...in/java/io/netty/handler/codec/http/websocketx/extensions/compression/DeflateEncoder.java
@@ -158,16 +158,7 @@ private ByteBuf compressContent(ChannelHandlerContext ctx, WebSocketFrame msg) {
     private void cleanup() {
         if (encoder != null) {
             // Clean-up the previous encoder if not cleaned up correctly.
-            if (encoder.finish()) {
-                for (;;) {
-                    ByteBuf buf = encoder.readOutbound();
-                    if (buf == null) {
-                        break;
-                    }
-                    // Release the buffer
-                    buf.release();
-                }
-            }
+            encoder.finishAndReleaseAll();
             encoder = null;
         }
     }