From dffaaf7324c8aa4c749d8c65a790665b096bf61d Mon Sep 17 00:00:00 2001 From: Jeff Wasty Date: Mon, 5 Jun 2023 10:04:42 -0700 Subject: [PATCH] paranthesis --- mssql-jdbc.properties | 3 +++ .../com/microsoft/sqlserver/jdbc/SQLServerConnection.java | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 mssql-jdbc.properties diff --git a/mssql-jdbc.properties b/mssql-jdbc.properties new file mode 100644 index 000000000..c1513a46c --- /dev/null +++ b/mssql-jdbc.properties @@ -0,0 +1,3 @@ +# +#Mon Jun 05 08:57:20 PDT 2023 +AKVTrustedEndpoints=;vault.azure.net diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerConnection.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerConnection.java index d5033f93a..daead4cdb 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerConnection.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerConnection.java @@ -6325,9 +6325,9 @@ final boolean complete(LogonCommand logonCommand, TDSReader tdsReader) throws SQ String databaseName = activeConnectionProperties .getProperty(SQLServerDriverStringProperty.DATABASE_NAME.toString()); String serverName = (null != currentConnectPlaceHolder) - ? currentConnectPlaceHolder.getServerName() + "\\" + currentConnectPlaceHolder.getInstanceName() - : activeConnectionProperties.getProperty(SQLServerDriverStringProperty.SERVER_NAME.toString()) + "\\" - + activeConnectionProperties.getProperty(SQLServerDriverStringProperty.INSTANCE_NAME.toString()); + ? (currentConnectPlaceHolder.getServerName() + "\\" + currentConnectPlaceHolder.getInstanceName()) + : (activeConnectionProperties.getProperty(SQLServerDriverStringProperty.SERVER_NAME.toString()) + "\\" + + activeConnectionProperties.getProperty(SQLServerDriverStringProperty.INSTANCE_NAME.toString())); if (null != serverName && serverName.length() > 128) { serverName = serverName.substring(0, 128);