refactoring - make isUnderflowHandlingEnabled private property

Author: yandryakov

src/main/java/com/rabbitmq/client/impl/nio/FrameBuilder.java

@@ -200,4 +200,9 @@ private void handleProtocolVersionMismatch() throws IOException {
         }
         throw x;
     }
+
+    //Indicates ssl underflow state - means that cipherBuffer should aggregate next chunks of bytes
+    public boolean isUnderflowHandlingEnabled() {
+        return false;
+    }
 }

src/main/java/com/rabbitmq/client/impl/nio/SocketChannelFrameHandlerState.java

@@ -26,7 +26,6 @@
 import java.nio.ByteBuffer;
 import java.nio.channels.SelectionKey;
 import java.nio.channels.SocketChannel;
-import java.util.concurrent.atomic.AtomicBoolean;
 
 
 /**
@@ -72,8 +71,6 @@ public class SocketChannelFrameHandlerState {
 
     final FrameBuilder frameBuilder;
 
-    private final AtomicBoolean isUnderflowHandlingEnabled = new AtomicBoolean(false);
-
     public SocketChannelFrameHandlerState(SocketChannel channel, NioLoopContext nioLoopsState, NioParams nioParams, SSLEngine sslEngine) {
         this.channel = channel;
         this.readSelectorState = nioLoopsState.readSelectorState;
@@ -109,7 +106,7 @@ public SocketChannelFrameHandlerState(SocketChannel channel, NioLoopContext nioL
             this.outputStream = new DataOutputStream(
                 new SslEngineByteBufferOutputStream(sslEngine, plainOut, cipherOut, channel)
             );
-            this.frameBuilder = new SslEngineFrameBuilder(sslEngine, plainIn, cipherIn, channel, isUnderflowHandlingEnabled);
+            this.frameBuilder = new SslEngineFrameBuilder(sslEngine, plainIn, cipherIn, channel);
         }
 
     }
@@ -180,7 +177,7 @@ void endWriteSequence() {
 
     void prepareForReadSequence() throws IOException {
         if(ssl) {
-            if (!isUnderflowHandlingEnabled.get()) {
+            if (!frameBuilder.isUnderflowHandlingEnabled()) {
                 cipherIn.clear();
                 cipherIn.flip();
             }
@@ -196,7 +193,7 @@ void prepareForReadSequence() throws IOException {
 
     boolean continueReading() throws IOException {
         if(ssl) {
-            if (isUnderflowHandlingEnabled.get()) {
+            if (frameBuilder.isUnderflowHandlingEnabled()) {
                 int bytesRead = NioHelper.read(channel, cipherIn);
                 if (bytesRead == 0) {
                     return false;

src/main/java/com/rabbitmq/client/impl/nio/SslEngineFrameBuilder.java

@@ -21,7 +21,6 @@
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.channels.ReadableByteChannel;
-import java.util.concurrent.atomic.AtomicBoolean;
 
 
 /**
@@ -34,18 +33,17 @@ public class SslEngineFrameBuilder extends FrameBuilder {
 
     private final ByteBuffer cipherBuffer;
 
-    private final AtomicBoolean isUnderflowHandlingEnabled;
+    private boolean isUnderflowHandlingEnabled = false;
 
-    public SslEngineFrameBuilder(SSLEngine sslEngine, ByteBuffer plainIn, ByteBuffer cipherIn, ReadableByteChannel channel, final AtomicBoolean isUnderflowHandlingEnabled) {
+    public SslEngineFrameBuilder(SSLEngine sslEngine, ByteBuffer plainIn, ByteBuffer cipherIn, ReadableByteChannel channel) {
         super(channel, plainIn);
         this.sslEngine = sslEngine;
         this.cipherBuffer = cipherIn;
-        this.isUnderflowHandlingEnabled = isUnderflowHandlingEnabled;
     }
 
     @Override
     protected boolean somethingToRead() throws IOException {
-        if (applicationBuffer.hasRemaining() && !isUnderflowHandlingEnabled.get()) {
+        if (applicationBuffer.hasRemaining() && !isUnderflowHandlingEnabled) {
             return true;
         } else {
             applicationBuffer.clear();
@@ -74,11 +72,15 @@ protected boolean somethingToRead() throws IOException {
                         throw new IllegalStateException("Invalid SSL status: " + result.getStatus());
                 }
             } finally {
-                isUnderflowHandlingEnabled.set(underflowHandling);
+                isUnderflowHandlingEnabled = underflowHandling;
             }
 
             return false;
         }
     }
 
+    @Override
+    public boolean isUnderflowHandlingEnabled() {
+        return isUnderflowHandlingEnabled;
+    }
 }