From 05f49b17cb3142b2739eaaee993aa0e77a75f562 Mon Sep 17 00:00:00 2001 From: Virtually Nick Date: Tue, 16 Jun 2020 09:55:56 -0400 Subject: [PATCH] GUACAMOLE-583: Correct SQLServer instance name property configuration. --- .../sqlserver/SQLServerAuthenticationProviderModule.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/src/main/java/org/apache/guacamole/auth/sqlserver/SQLServerAuthenticationProviderModule.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/src/main/java/org/apache/guacamole/auth/sqlserver/SQLServerAuthenticationProviderModule.java index ce18ce145..2f9147a55 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/src/main/java/org/apache/guacamole/auth/sqlserver/SQLServerAuthenticationProviderModule.java +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/src/main/java/org/apache/guacamole/auth/sqlserver/SQLServerAuthenticationProviderModule.java @@ -70,16 +70,17 @@ public class SQLServerAuthenticationProviderModule implements Module { myBatisProperties.setProperty("JDBC.username", environment.getSQLServerUsername()); myBatisProperties.setProperty("JDBC.password", environment.getSQLServerPassword()); - String instance = environment.getSQLServerInstance(); - if (instance != null) - myBatisProperties.setProperty("JDBC.instanceName", instance); - myBatisProperties.setProperty("JDBC.autoCommit", "false"); myBatisProperties.setProperty("mybatis.pooled.pingEnabled", "true"); myBatisProperties.setProperty("mybatis.pooled.pingQuery", "SELECT 1"); // Use UTF-8 in database driverProperties.setProperty("characterEncoding", "UTF-8"); + + // Retrieve instance name and set it + String instance = environment.getSQLServerInstance(); + if (instance != null) + driverProperties.setProperty("JDBC.instanceName", instance); // Capture which driver to use for the connection. this.sqlServerDriver = environment.getSQLServerDriver();