address naming concerns

2 files changed, 12 insertions, 12 deletions

diff --git a/jrt/src/com/yahoo/jrt/MaybeTlsCryptoEngine.java b/jrt/src/com/yahoo/jrt/MaybeTlsCryptoEngine.java
index 8cb560246e8..6664934799c 100644
--- a/jrt/src/com/yahoo/jrt/MaybeTlsCryptoEngine.java
+++ b/jrt/src/com/yahoo/jrt/MaybeTlsCryptoEngine.java
@@ -7,28 +7,28 @@ import java.nio.channels.SocketChannel;
  * A crypto engine that supports both tls encrypted connections and
  * unencrypted connections. The use of tls for incoming connections is
  * auto-detected using clever heuristics. The use of tls for outgoing
- * connections is controlled by the useTls flag given to the
+ * connections is controlled by the useTlsWhenClient flag given to the
  * constructor.
  **/
 public class MaybeTlsCryptoEngine implements CryptoEngine {
 
     private final TlsCryptoEngine tlsEngine;
-    private final boolean useTls;
+    private final boolean useTlsWhenClient;
 
-    public MaybeTlsCryptoEngine(TlsCryptoEngine tlsEngine, boolean useTls) {
+    public MaybeTlsCryptoEngine(TlsCryptoEngine tlsEngine, boolean useTlsWhenClient) {
         this.tlsEngine = tlsEngine;
-        this.useTls = useTls;
+        this.useTlsWhenClient = useTlsWhenClient;
     }
 
     @Override public CryptoSocket createCryptoSocket(SocketChannel channel, boolean isServer) {
         if (isServer) {
             return new MaybeTlsCryptoSocket(channel, tlsEngine);
-        } else if (useTls) {
+        } else if (useTlsWhenClient) {
             return tlsEngine.createCryptoSocket(channel, false);
         } else {
             return new NullCryptoSocket(channel);
         }
     }
 
-    @Override public String toString() { return "MaybeTlsCryptoEngine(useTls:" + useTls + ")"; }
+    @Override public String toString() { return "MaybeTlsCryptoEngine(useTlsWhenClient:" + useTlsWhenClient + ")"; }
 }
diff --git a/jrt/src/com/yahoo/jrt/MaybeTlsCryptoSocket.java b/jrt/src/com/yahoo/jrt/MaybeTlsCryptoSocket.java
index 7cedbcda9a1..1cf3dfd1261 100644
--- a/jrt/src/com/yahoo/jrt/MaybeTlsCryptoSocket.java
+++ b/jrt/src/com/yahoo/jrt/MaybeTlsCryptoSocket.java
@@ -16,13 +16,13 @@ import java.nio.channels.SocketChannel;
  **/
 public class MaybeTlsCryptoSocket implements CryptoSocket {
 
-    private static final int snoop_size = 9;
+    private static final int SNOOP_SIZE = 9;
 
     private CryptoSocket socket;
 
     // 'data' is the first 9 bytes received from the client
     public static boolean looksLikeTlsToMe(byte[] data) {
-        if (data.length != snoop_size) {
+        if (data.length != SNOOP_SIZE) {
             return false; // wrong data size for tls detection
         }
         if (data[0] != 22) {
@@ -67,13 +67,13 @@ public class MaybeTlsCryptoSocket implements CryptoSocket {
 
         @Override public HandshakeResult handshake() throws IOException {
             if (factory != null) {
-                channel().read(buffer.getWritable(snoop_size));
-                if (buffer.bytes() < snoop_size) {
+                channel().read(buffer.getWritable(SNOOP_SIZE));
+                if (buffer.bytes() < SNOOP_SIZE) {
                     return HandshakeResult.NEED_READ;
                 }
-                byte[] data = new byte[snoop_size];
+                byte[] data = new byte[SNOOP_SIZE];
                 ByteBuffer src = buffer.getReadable();
-                for (int i = 0; i < snoop_size; i++) {
+                for (int i = 0; i < SNOOP_SIZE; i++) {
                     data[i] = src.get(i);
                 }
                 if (looksLikeTlsToMe(data)) {