Fix lock issues around disableSSL and IOBuffer (#2295)

* Renamed locks in IOBuffer, disableSSL should have had its own lock

* Renamed locks in IOBuffer, disableSSL should have had its own lock

* TDSChannelLock --> tdsChannelLock

* Renamed TDSReader lock --> tdsReaderLock

* TDSChannelLock --> tdsChannelLock

* Renamed TDSReader lock --> tdsReaderLock

Author: Jeffery-Wasty

src/main/java/com/microsoft/sqlserver/jdbc/IOBuffer.java

@@ -672,7 +672,7 @@ final boolean isLoggingPackets() {
     int numMsgsSent = 0;
     int numMsgsRcvd = 0;
 
-    private final transient Lock lock = new ReentrantLock();
+    private final transient Lock tdsChannelLock = new ReentrantLock();
 
     // Last SPID received from the server. Used for logging and to tag subsequent outgoing
     // packets to facilitate diagnosing problems from the server side.
@@ -773,7 +773,7 @@ void disableSSL() {
             logger.finer(toString() + " Disabling SSL...");
         }
 
-        lock.lock();
+        tdsChannelLock.lock();
         try {
             // Guard in case of disableSSL being called before enableSSL
             if (proxySocket == null) {
@@ -839,7 +839,7 @@ void disableSSL() {
             channelSocket = tcpSocket;
             sslSocket = null;
         } finally {
-            lock.unlock();
+            tdsChannelLock.unlock();
         }
 
         if (logger.isLoggable(Level.FINER))
@@ -1056,6 +1056,8 @@ private void writeInternal(byte[] b, int off, int len) throws IOException {
     private final class ProxyInputStream extends InputStream {
         private InputStream filteredStream;
 
+        private final transient Lock proxyInputStreamLock = new ReentrantLock();
+
         /**
          * Bytes that have been read by a poll(s).
          */
@@ -1082,7 +1084,7 @@ final void setFilteredStream(InputStream is) {
          *         If an I/O exception occurs.
          */
         public boolean poll() {
-            lock.lock();
+            proxyInputStreamLock.lock();
             try {
                 int b;
                 try {
@@ -1117,7 +1119,7 @@ public boolean poll() {
 
                 return true;
             } finally {
-                lock.unlock();
+                proxyInputStreamLock.unlock();
             }
         }
 
@@ -1133,7 +1135,7 @@ private int getOneFromCache() {
 
         @Override
         public long skip(long n) throws IOException {
-            lock.lock();
+            proxyInputStreamLock.lock();
             try {
                 long bytesSkipped = 0;
 
@@ -1154,7 +1156,7 @@ public long skip(long n) throws IOException {
 
                 return bytesSkipped;
             } finally {
-                lock.unlock();
+                proxyInputStreamLock.unlock();
             }
         }
 
@@ -1191,7 +1193,7 @@ public int read(byte[] b, int offset, int maxBytes) throws IOException {
         }
 
         private int readInternal(byte[] b, int offset, int maxBytes) throws IOException {
-            lock.lock();
+            proxyInputStreamLock.lock();
             try {
                 int bytesRead;
 
@@ -1240,7 +1242,7 @@ private int readInternal(byte[] b, int offset, int maxBytes) throws IOException
 
                 return bytesRead;
             } finally {
-                lock.unlock();
+                proxyInputStreamLock.unlock();
             }
         }
 
@@ -1259,11 +1261,11 @@ public void mark(int readLimit) {
             if (logger.isLoggable(Level.FINEST))
                 logger.finest(super.toString() + " Marking next " + readLimit + " bytes");
 
-            lock.lock();
+            proxyInputStreamLock.lock();
             try {
                 filteredStream.mark(readLimit);
             } finally {
-                lock.unlock();
+                proxyInputStreamLock.unlock();
             }
         }
 
@@ -1272,12 +1274,12 @@ public void reset() throws IOException {
             if (logger.isLoggable(Level.FINEST))
                 logger.finest(super.toString() + " Resetting to previous mark");
 
-            lock.lock();
+            proxyInputStreamLock.lock();
             try {
 
                 filteredStream.reset();
             } finally {
-                lock.unlock();
+                proxyInputStreamLock.unlock();
             }
         }
 
@@ -6688,7 +6690,7 @@ final SQLServerConnection getConnection() {
     private boolean serverSupportsColumnEncryption = false;
     private boolean serverSupportsDataClassification = false;
     private byte serverSupportedDataClassificationVersion = TDS.DATA_CLASSIFICATION_NOT_ENABLED;
-    private final transient Lock lock = new ReentrantLock();
+    private final transient Lock tdsReaderLock = new ReentrantLock();
 
     private final byte[] valueBytes = new byte[256];
 
@@ -6808,7 +6810,7 @@ private boolean nextPacket() throws SQLServerException {
      * the response and another thread that is trying to buffer it with TDSCommand.detach().
      */
     final boolean readPacket() throws SQLServerException {
-        lock.lock();
+        tdsReaderLock.lock();
         try {
             if (null != command && !command.readingResponse())
                 return false;
@@ -6921,7 +6923,7 @@ final boolean readPacket() throws SQLServerException {
 
             return true;
         } finally {
-            lock.unlock();
+            tdsReaderLock.unlock();
         }
     }