Update Master with latest dev branch

CHANGELOG.md

@@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/) 
 
+## [6.3.5] Preview Release
+### Added
+- Added handle for Account Locked Exception 18486 during login in SQLServerConnection [#522](https://github.com/Microsoft/mssql-jdbc/pull/522)
+
+### Fixed Issues 
+- Fixed the issues with Prepared Statement Metadata Caching implementation [#543](https://github.com/Microsoft/mssql-jdbc/pull/543)
+- Fixed issues with static logger member in abstract class 'SQLServerClobBase' [#537](https://github.com/Microsoft/mssql-jdbc/pull/537)
+
 ## [6.3.4] Preview Release
 ### Added
 - Added new ThreadGroup creation to prevent IllegalThreadStateException if the underlying ThreadGroup has been destroyed. [#474](https://github.com/Microsoft/mssql-jdbc/pull/474)

README.md

@@ -90,7 +90,7 @@ To get the latest preview version of the driver, add the following to your POM f
 <dependency>
 	<groupId>com.microsoft.sqlserver</groupId>
 	<artifactId>mssql-jdbc</artifactId>
-	<version>6.3.4.jre8-preview</version>
+	<version>6.3.5.jre8-preview</version>
 </dependency>
 ```
 
@@ -120,7 +120,7 @@ Projects that require either of the two features need to explicitly declare the
 <dependency>
 	<groupId>com.microsoft.sqlserver</groupId>
 	<artifactId>mssql-jdbc</artifactId>
-	<version>6.3.4.jre8-preview</version>
+	<version>6.3.5.jre8-preview</version>
 	<scope>compile</scope>
 </dependency>
 

build.gradle

@@ -66,7 +66,7 @@ repositories {
 }
 
 dependencies {
-	compile 'com.microsoft.azure:azure-keyvault:0.9.7',
+	compile 'com.microsoft.azure:azure-keyvault:1.0.0',
 	'com.microsoft.azure:adal4j:1.1.3'
 
 	testCompile 'junit:junit:4.12',

pom.xml

@@ -4,8 +4,7 @@
 
 	<groupId>com.microsoft.sqlserver</groupId>
 	<artifactId>mssql-jdbc</artifactId>
-	<version>6.3.4</version>
-
+	<version>6.3.5.${jreVersion}-preview</version>
 	<packaging>jar</packaging>
 
 	<name>Microsoft JDBC Driver for SQL Server</name>
@@ -140,6 +139,11 @@
 	<profiles>
 		<profile>
 			<id>build41</id>
+
+			<properties>
+			<jreVersion>jre7</jreVersion>
+			</properties>
+
 			<build>
 				<plugins>
 					<plugin>
@@ -158,7 +162,6 @@
 						<artifactId>maven-jar-plugin</artifactId>
 						<version>3.0.2</version>
 						<configuration>
-							<finalName>${project.artifactId}-${project.version}.jre7-preview</finalName>
 							<archive>
 								<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
 							</archive>
@@ -171,9 +174,15 @@
 
 		<profile>
 			<id>build42</id>
+
 			<activation>
 				<activeByDefault>true</activeByDefault>
 			</activation>
+
+			<properties>
+			<jreVersion>jre8</jreVersion>
+			</properties>
+
 			<build>
 				<plugins>
 					<plugin>
@@ -192,7 +201,6 @@
 						<artifactId>maven-jar-plugin</artifactId>
 						<version>3.0.2</version>
 						<configuration>
-							<finalName>${project.artifactId}-${project.version}.jre8-preview</finalName>
 							<archive>
 								<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
 							</archive>

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

@@ -11,6 +11,6 @@
 final class SQLJdbcVersion {
     static final int major = 6;
     static final int minor = 3;
-    static final int patch = 4;
+    static final int patch = 5;
     static final int build = 0;
 }

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

@@ -35,9 +35,6 @@
 public class SQLServerClob extends SQLServerClobBase implements Clob {
     private static final long serialVersionUID = 2872035282200133865L;
 
-    // Loggers should be class static to avoid lock contention with multiple threads
-    private static final Logger logger = Logger.getLogger("com.microsoft.sqlserver.jdbc.internals.SQLServerClob");
-
     /**
      * Create a new CLOB
      *
@@ -50,19 +47,19 @@ public class SQLServerClob extends SQLServerClobBase implements Clob {
     @Deprecated
     public SQLServerClob(SQLServerConnection connection,
             String data) {
-        super(connection, data, (null == connection) ? null : connection.getDatabaseCollation(), logger, null);
+        super(connection, data, (null == connection) ? null : connection.getDatabaseCollation(), null);
 
         if (null == data)
             throw new NullPointerException(SQLServerException.getErrString("R_cantSetNull"));
     }
 
     SQLServerClob(SQLServerConnection connection) {
-        super(connection, "", connection.getDatabaseCollation(), logger, null);
+        super(connection, "", connection.getDatabaseCollation(), null);
     }
 
     SQLServerClob(BaseInputStream stream,
             TypeInfo typeInfo) throws SQLServerException, UnsupportedEncodingException {
-        super(null, stream, typeInfo.getSQLCollation(), logger , typeInfo);
+        super(null, stream, typeInfo.getSQLCollation(), typeInfo);
     }
 
     final JDBCType getJdbcType() {
@@ -91,7 +88,9 @@ abstract class SQLServerClobBase implements Serializable {
     private ArrayList<Closeable> activeStreams = new ArrayList<>(1);
 
     transient SQLServerConnection con;
-    private static Logger logger;
+
+    private final Logger logger = Logger.getLogger(getClass().getName());
+
     final private String traceID = getClass().getName().substring(1 + getClass().getName().lastIndexOf('.')) + ":" + nextInstanceID();
 
     final public String toString() {
@@ -129,7 +128,6 @@ private String getDisplayClassName() {
     SQLServerClobBase(SQLServerConnection connection,
             Object data,
             SQLCollation collation,
-            Logger logger,
             TypeInfo typeInfo) {
         this.con = connection;
         if (data instanceof BaseInputStream) {
@@ -140,7 +138,6 @@ private String getDisplayClassName() {
         }
         this.sqlCollation = collation;
         this.typeInfo = typeInfo;
-        SQLServerClobBase.logger = logger;
 
         if (logger.isLoggable(Level.FINE)) {
             String loggingInfo = (null != connection) ? connection.toString() : "null connection";

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

@@ -83,6 +83,9 @@
 
 // Note all the public functions in this class also need to be defined in SQLServerConnectionPoolProxy.
 public class SQLServerConnection implements ISQLServerConnection {
+    boolean contextIsAlreadyChanged = false;
+    boolean contextChanged = false;
+
     long timerExpire;
     boolean attemptRefreshTokenLocked = false;
 
@@ -1991,6 +1994,7 @@ else if (null == currentPrimaryPlaceHolder) {
             catch (SQLServerException sqlex) {
                 if ((SQLServerException.LOGON_FAILED == sqlex.getErrorCode()) // actual logon failed, i.e. bad password
                         || (SQLServerException.PASSWORD_EXPIRED == sqlex.getErrorCode()) // actual logon failed, i.e. password isExpired
+                        || (SQLServerException.USER_ACCOUNT_LOCKED == sqlex.getErrorCode()) // actual logon failed, i.e. user account locked
                         || (SQLServerException.DRIVER_ERROR_INVALID_TDS == sqlex.getDriverErrorCode()) // invalid TDS received from server
                         || (SQLServerException.DRIVER_ERROR_SSL_FAILED == sqlex.getDriverErrorCode()) // failure negotiating SSL
                         || (SQLServerException.DRIVER_ERROR_INTERMITTENT_TLS_FAILED == sqlex.getDriverErrorCode()) // failure TLS1.2
@@ -3079,6 +3083,8 @@ final void poolCloseEventNotify() throws SQLServerException {
         checkClosed();
         if (catalog != null) {
             connectionCommand("use " + Util.escapeSQLId(catalog), "setCatalog");
+            contextIsAlreadyChanged = true;
+            contextChanged = true;
             sCatalog = catalog;
         }
         loggerExternal.exiting(getClassNameLogging(), "setCatalog");
@@ -5760,6 +5766,12 @@ final void evictCachedPreparedStatementHandle(PreparedStatementHandle handle) {
     	preparedStatementHandleCache.remove(handle.getKey());
     }
 
+    final void clearCachedPreparedStatementHandle() {
+        if (null != preparedStatementHandleCache) {
+            preparedStatementHandleCache.clear();
+        }
+    }
+
     // Handle closing handles when removed from cache.
     final class PreparedStatementCacheEvictionListener implements EvictionListener<Sha1HashKey, PreparedStatementHandle> {
         public void onEviction(Sha1HashKey key, PreparedStatementHandle handle) {

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

@@ -168,6 +168,9 @@ public void run() {
         if (bIsOpen && (null != wrappedConnection)) {
             if (wrappedConnection.getConnectionLogger().isLoggable(Level.FINER))
                 wrappedConnection.getConnectionLogger().finer(toString() + " Connection proxy closed ");
+
+            // clear cached prepared statement handle on this connection
+            wrappedConnection.clearCachedPreparedStatementHandle();
             wrappedConnection.poolCloseEventNotify();
             wrappedConnection = null;
         }

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

@@ -59,6 +59,7 @@ public final class SQLServerException extends java.sql.SQLException {
     // SQL error values (from sqlerrorcodes.h)
     static final int LOGON_FAILED = 18456;
     static final int PASSWORD_EXPIRED = 18488;
+    static final int USER_ACCOUNT_LOCKED = 18486;
     static java.util.logging.Logger exLogger = java.util.logging.Logger.getLogger("com.microsoft.sqlserver.jdbc.internals.SQLServerException");
 
     // Facility for driver-specific error codes

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

@@ -10,23 +10,22 @@
 
 import java.io.UnsupportedEncodingException;
 import java.sql.NClob;
-import java.util.logging.Logger;
 
 /**
  * SQLServerNClob represents a National Character Set LOB object and implements java.sql.NClob.
  */
 
 public final class SQLServerNClob extends SQLServerClobBase implements NClob {
-    // Loggers should be class static to avoid lock contention with multiple threads
-    private static final Logger logger = Logger.getLogger("com.microsoft.sqlserver.jdbc.internals.SQLServerNClob");
 
-    SQLServerNClob(SQLServerConnection connection) {
-        super(connection, "", connection.getDatabaseCollation(), logger, null);
+	private static final long serialVersionUID = 1L;
+
+	SQLServerNClob(SQLServerConnection connection) {
+        super(connection, "", connection.getDatabaseCollation(), null);
     }
 
     SQLServerNClob(BaseInputStream stream,
             TypeInfo typeInfo) throws SQLServerException, UnsupportedEncodingException {
-        super(null, stream, typeInfo.getSQLCollation(), logger , typeInfo);
+        super(null, stream, typeInfo.getSQLCollation(), typeInfo);
     }
 
     final JDBCType getJdbcType() {