From 74140dbf53456c30600d7870316c5ac79878a003 Mon Sep 17 00:00:00 2001 From: Scott Mitchell Date: Tue, 11 Jul 2017 18:15:25 -0700 Subject: [PATCH] Correct merge error from f7b3caeddc5bb1da75aaafa4a66dec88ed585d69 --- .../java/io/netty/handler/ssl/ReferenceCountedOpenSslEngine.java | 1 - 1 file changed, 1 deletion(-) diff --git a/handler/src/main/java/io/netty/handler/ssl/ReferenceCountedOpenSslEngine.java b/handler/src/main/java/io/netty/handler/ssl/ReferenceCountedOpenSslEngine.java index 5f877b8201..29d86d4ff8 100644 --- a/handler/src/main/java/io/netty/handler/ssl/ReferenceCountedOpenSslEngine.java +++ b/handler/src/main/java/io/netty/handler/ssl/ReferenceCountedOpenSslEngine.java @@ -235,7 +235,6 @@ public class ReferenceCountedOpenSslEngine extends SSLEngine implements Referenc } finally { readerLock.unlock(); } - ssl = SSL.newSSL(context.ctx, !context.isClient()); try { networkBIO = SSL.bioNewByteBuffer(ssl, context.getBioNonApplicationBufferSize());