From 610ed6934ec4e8fe8a4be99366db38fe7e87581f Mon Sep 17 00:00:00 2001
From: Nick Couchman <nick_couchman@cotyinc.com>
Date: Mon, 26 Aug 2019 11:19:35 -0400
Subject: [PATCH] GUACAMOLE-234: Fix bind issue that occurs using
 try-with-resources.

---
 .../org/apache/guacamole/auth/ldap/LDAPConnectionService.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/LDAPConnectionService.java b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/LDAPConnectionService.java
index 49a3f7c2d..7141a79cc 100644
--- a/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/LDAPConnectionService.java
+++ b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/LDAPConnectionService.java
@@ -129,7 +129,8 @@ public class LDAPConnectionService {
             throws GuacamoleException {
 
         // Get ldapConnection and try to connect and bind.
-        try (LdapNetworkConnection ldapConnection = createLDAPConnection()) {
+        LdapNetworkConnection ldapConnection = createLDAPConnection();
+        try {
 
             // Connect to LDAP server
             ldapConnection.connect();
@@ -155,6 +156,7 @@ public class LDAPConnectionService {
 
         // Disconnect if an error occurs during bind
         catch (LdapException e) {
+            ldapConnection.close();
             logger.debug("Unable to bind to LDAP server.", e);
             throw new GuacamoleInvalidCredentialsException(
                     "Unable to bind to the LDAP server.",