Fixes trustStorePassword set to null when using applicationIntent=ReadOnly

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

@@ -1734,10 +1734,6 @@ else if (con.getTrustManagerClass() != null) {
                     try {
                         ks.load(is, (null == trustStorePassword) ? null : trustStorePassword.toCharArray());
                     } finally {
-                        // We are done with the trustStorePassword (if set). Clear it for better security.
-                        con.activeConnectionProperties
-                                .remove(SQLServerDriverStringProperty.TRUST_STORE_PASSWORD.toString());
-
                         // We are also done with the trust store input stream.
                         if (null != is) {
                             try {
@@ -4029,8 +4025,7 @@ void writeNonUnicodeReader(Reader reader, long advertisedLength, boolean isDestB
 
         do {
             // Read in next chunk
-            for (charsToWrite = 0; -1 != charsRead && charsToWrite < currentPacketSize;
-                    charsToWrite += charsRead) {
+            for (charsToWrite = 0; -1 != charsRead && charsToWrite < currentPacketSize; charsToWrite += charsRead) {
                 try {
                     charsRead = reader.read(streamCharBuffer, charsToWrite, currentPacketSize - charsToWrite);
                 } catch (IOException e) {

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

@@ -2355,6 +2355,8 @@ else if (0 == requestedPacketSize)
                 if (!state.equals(State.Closed))
                     this.close();
             }
+
+            activeConnectionProperties.remove(SQLServerDriverStringProperty.TRUST_STORE_PASSWORD.toString());
         }
 
         return this;