Skip to content

Merging dev to JDBC4.3 with static modifier changes #587

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cheenamalhotra merged 2 commits into from
Dec 15, 2017
Merged

Merging dev to JDBC4.3 with static modifier changes #587

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e475d9
Stress test changes - the static meodifier was causing concurrency is…
peterbae Dec 13, 2017
4bd1e48
Merge pull request #584 from peterbae/stress-test
peterbae Dec 15, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/com/microsoft/sqlserver/jdbc/SQLServerConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@ ServerPortPlaceHolder getRoutingInfo() {
// is
// false).

private static String hostName = null;
private String hostName = null;

boolean sendStringParametersAsUnicode() {
return sendStringParametersAsUnicode;
Expand Down Expand Up @@ -4414,7 +4414,7 @@ else if (serverMajorVersion >= 9) // Yukon (9.0) --> TDS 7.2 // Prelogin disconn
tdsWriter.writeShort((short) TDS_LOGIN_REQUEST_BASE_LEN);

// Hostname
tdsWriter.writeShort((short) (hostName == null ? 0 : hostName.length()));
tdsWriter.writeShort((short) ((hostName != null && !hostName.isEmpty()) ? hostName.length() : 0));
dataLen += hostnameBytes.length;

// Only send user/password over if not fSSPI or fed auth ADAL... If both user/password and SSPI are in login
Expand Down