[guacamole-client] branch master updated: GUACAMOLE-717: Handle LDAPException gracefully when processing LDAP search results

[vnick]

This is an automated email from the ASF dual-hosted git repository.

vnick pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/guacamole-client.git


The following commit(s) were added to refs/heads/master by this push:
     new 93d8041  GUACAMOLE-717: Handle LDAPException gracefully when 
processing LDAP search results
     new 48f5f57  GUACAMOLE-717: Merge handle LDAPException gracefully when 
doing a search
93d8041 is described below

commit 93d80418ba0d0e6b1ddee2c406554a559c593ac7
Author: Joel Best <jb...@uoguelph.ca>
AuthorDate: Fri Jan 25 17:45:02 2019 -0500

    GUACAMOLE-717: Handle LDAPException gracefully when processing LDAP search 
results
---
 .../main/java/org/apache/guacamole/auth/ldap/ObjectQueryService.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git 
a/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/ObjectQueryService.java
 
b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/ObjectQueryService.java
index 94550a2..2196c2f 100644
--- 
a/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/ObjectQueryService.java
+++ 
b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/ObjectQueryService.java
@@ -221,6 +221,11 @@ public class ObjectQueryService {
                         logger.debug("Got a referral, but configured to not 
follow them.", e);
                     }
                 }
+                
+                catch (LDAPException e) {
+                  logger.warn("Failed to process an LDAP search result. Error 
was: {}", e.resultCodeToString());
+                  logger.debug("Error processing LDAPEntry search result.", e);
+                }
 
             }