Correct merge error from f7b3caeddc5bb1da75aaafa4a66dec88ed585d69

2017-07-11 18:15:25 -07:00 · 2017-07-11 18:15:25 -07:00 · 74140dbf53
commit 74140dbf53
parent 81fb2eede8
1 changed files with 0 additions and 1 deletions
--- 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());