fix

microsoft · Apr 22, 2021 · a472328 · a472328
1 parent 0041c40
commit a472328
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerConnection.java b/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;
@@ -2824,7 +2826,7 @@ private InetSocketAddress connectHelper(ServerPortPlaceHolder serverInfo, int ti
         }
 
         activeConnectionProperties.remove(SQLServerDriverStringProperty.CLIENT_KEY_PASSWORD.toString());
-
+        
         // We have successfully connected, now do the login. logon takes seconds timeout
         executeCommand(new LogonCommand());
         return inetSocketAddress;
@@ -4520,8 +4522,6 @@ final void processFedAuthInfo(TDSReader tdsReader, TDSTokenHandler tdsTokenHandl
 
         aadPrincipalSecret = "";
         activeConnectionProperties.remove(SQLServerDriverStringProperty.AAD_SECURE_PRINCIPAL_SECRET.toString());
-
-        activeConnectionProperties.remove(SQLServerDriverStringProperty.TRUST_STORE_PASSWORD.toString());
     }
 
     final class FedAuthTokenCommand extends UninterruptableTDSCommand {