Merge 1.1.0 changes back to master.

This commit is contained in:
Michael Jumper
2019-09-01 15:07:38 -07:00

View File

@@ -129,7 +129,8 @@ public class LDAPConnectionService {
throws GuacamoleException { throws GuacamoleException {
// Get ldapConnection and try to connect and bind. // Get ldapConnection and try to connect and bind.
try (LdapNetworkConnection ldapConnection = createLDAPConnection()) { LdapNetworkConnection ldapConnection = createLDAPConnection();
try {
// Connect to LDAP server // Connect to LDAP server
ldapConnection.connect(); ldapConnection.connect();
@@ -155,6 +156,7 @@ public class LDAPConnectionService {
// Disconnect if an error occurs during bind // Disconnect if an error occurs during bind
catch (LdapException e) { catch (LdapException e) {
ldapConnection.close();
logger.debug("Unable to bind to LDAP server.", e); logger.debug("Unable to bind to LDAP server.", e);
throw new GuacamoleInvalidCredentialsException( throw new GuacamoleInvalidCredentialsException(
"Unable to bind to the LDAP server.", "Unable to bind to the LDAP server.",