From fc22681b82a6747fa740df820e599a67ce0593e1 Mon Sep 17 00:00:00 2001 From: ulvii Date: Wed, 18 Oct 2017 12:31:44 -0700 Subject: [PATCH 1/6] update --- .../com/microsoft/sqlserver/jdbc/SQLServerResultSet.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerResultSet.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerResultSet.java index 8c58a8c949..e8e7c8924e 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerResultSet.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerResultSet.java @@ -6280,7 +6280,8 @@ boolean onRow(TDSReader tdsReader) throws SQLServerException { // Consume the ROW token, leaving tdsReader at the start of // this row's column values. - assert TDS.TDS_ROW == tdsReader.readUnsignedByte(); + if (TDS.TDS_ROW != tdsReader.readUnsignedByte()) + assert false; fetchBufferCurrentRowType = RowType.ROW; return false; } @@ -6290,7 +6291,8 @@ boolean onNBCRow(TDSReader tdsReader) throws SQLServerException { // Consume the NBCROW token, leaving tdsReader at the start of // nullbitmap. - assert TDS.TDS_NBCROW == tdsReader.readUnsignedByte(); + if (TDS.TDS_NBCROW != tdsReader.readUnsignedByte()) + assert false; fetchBufferCurrentRowType = RowType.NBCROW; return false; @@ -6591,4 +6593,4 @@ final boolean doExecute() throws SQLServerException { logger.finer(toString() + " Closed cursor:" + serverCursorId); } } -} +} \ No newline at end of file From 90a70a6f76c77f0ad9b0f6f3e5a02ce3c5a5fc91 Mon Sep 17 00:00:00 2001 From: ulvii Date: Wed, 18 Oct 2017 12:40:01 -0700 Subject: [PATCH 2/6] newline --- .../java/com/microsoft/sqlserver/jdbc/SQLServerResultSet.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerResultSet.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerResultSet.java index e8e7c8924e..e937b27c36 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerResultSet.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerResultSet.java @@ -6593,4 +6593,4 @@ final boolean doExecute() throws SQLServerException { logger.finer(toString() + " Closed cursor:" + serverCursorId); } } -} \ No newline at end of file +} From f4b0e199011e94359eac4ba47e45902ddc935f8f Mon Sep 17 00:00:00 2001 From: ulvii Date: Wed, 18 Oct 2017 13:27:57 -0700 Subject: [PATCH 3/6] 6.3.4-preview release --- CHANGELOG.md | 14 ++++++++++++++ README.md | 4 ++-- pom.xml | 2 +- .../microsoft/sqlserver/jdbc/SQLJdbcVersion.java | 2 +- 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5e909a89d6..0fe6a57176 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,20 @@ 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.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) +- Added try-with-resources to JUnit tests [#520](https://github.com/Microsoft/mssql-jdbc/pull/520) + +### Fixed Issues +- Fixed the issue with passing parameters names that start with '@' to a CallableStatement [#495](https://github.com/Microsoft/mssql-jdbc/pull/495) +- Fixed SQLServerDataTable creation being O(n^2) issue [#514](https://github.com/Microsoft/mssql-jdbc/pull/514) + +### Changed +- Changed some manual array copying to System.arraycopy() [#500](https://github.com/Microsoft/mssql-jdbc/pull/500) +- Removed redundant toString() on String objects [#501](https://github.com/Microsoft/mssql-jdbc/pull/501) +- Replaced literals with constants [#502](https://github.com/Microsoft/mssql-jdbc/pull/502) + ## [6.3.3] Preview Release ### Added - Added connection properties for specifying custom TrustManager [#74](https://github.com/Microsoft/mssql-jdbc/pull/74) diff --git a/README.md b/README.md index 2196f02d4b..1edeca9e14 100644 --- a/README.md +++ b/README.md @@ -90,7 +90,7 @@ To get the latest preview version of the driver, add the following to your POM f com.microsoft.sqlserver mssql-jdbc - 6.3.3.jre8-preview + 6.3.4.jre8-preview ``` @@ -120,7 +120,7 @@ Projects that require either of the two features need to explicitly declare the com.microsoft.sqlserver mssql-jdbc - 6.3.3.jre8-preview + 6.3.4.jre8-preview compile diff --git a/pom.xml b/pom.xml index 296eb209ec..8c39911c9d 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.microsoft.sqlserver mssql-jdbc - 6.3.4-SNAPSHOT + 6.3.4 jar diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLJdbcVersion.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLJdbcVersion.java index 9c9f7b6912..2aa091ff06 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLJdbcVersion.java +++ b/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 = 3; + static final int patch = 4; static final int build = 0; } From bef6492b8c848303e5b081069dbe1694cabe9aa4 Mon Sep 17 00:00:00 2001 From: ulvii Date: Thu, 19 Oct 2017 12:20:31 -0700 Subject: [PATCH 4/6] Update pom.xml to 6.3.5-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8c39911c9d..9fe11fb530 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.microsoft.sqlserver mssql-jdbc - 6.3.4 + 6.3.5-SNAPSHOT jar From b34aa39dc4a97537409d0658d0a55c179dbd017b Mon Sep 17 00:00:00 2001 From: ulvii Date: Thu, 19 Oct 2017 12:28:05 -0700 Subject: [PATCH 5/6] add snapshot to pom file --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5eba1ff5b1..2432660efc 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.microsoft.sqlserver mssql-jdbc - 6.3.4 + 6.3.5-SNAPSHOT jar From 8eb1404c5aeb7683ea428effbf65238a0d39c0c4 Mon Sep 17 00:00:00 2001 From: ulvii Date: Thu, 19 Oct 2017 12:29:10 -0700 Subject: [PATCH 6/6] add new line to the end of pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2432660efc..9fe11fb530 100644 --- a/pom.xml +++ b/pom.xml @@ -331,4 +331,4 @@ - \ No newline at end of file +