[BUG] 🥅 Catch all LdapException when using mono connection

Signed-off-by: Cécile Chemin <[email protected]>
InseeFr · Dec 7, 2023 · e951513 · e951513
1 parent e46d688
commit e951513
Showing 1 changed file with 10 additions and 13 deletions.
diff --git a/sugoi-api-ldap-store-provider/src/main/java/fr/insee/sugoi/store/ldap/LdapReaderStore.java b/sugoi-api-ldap-store-provider/src/main/java/fr/insee/sugoi/store/ldap/LdapReaderStore.java
@@ -330,21 +330,18 @@ private <R extends SugoiObject> PageResult<R> searchOnLdap(
     try {
       searchResult = ldapMonoConnection.search(searchRequest);
     } catch (LDAPException e) {
-      if (e.getResultCode().intValue() == ResultCode.SERVER_DOWN_INT_VALUE) {
-        try {
-          if (Boolean.TRUE.equals(
-              Boolean.valueOf(config.get(LdapConfigKeys.READ_CONNECTION_AUTHENTICATED)))) {
-            ldapMonoConnection = LdapFactory.getSingleConnectionAuthenticated(config, true);
-          } else {
-            ldapMonoConnection = LdapFactory.getSingleConnection(config, true);
-          }
-        } catch (LDAPException e1) {
-          throw new StoreException("Search failed", e1);
+      try {
+        logger.info("Retry connection for error code " + e.getResultCode().intValue());
+        if (Boolean.TRUE.equals(
+            Boolean.valueOf(config.get(LdapConfigKeys.READ_CONNECTION_AUTHENTICATED)))) {
+          ldapMonoConnection = LdapFactory.getSingleConnectionAuthenticated(config, true);
+        } else {
+          ldapMonoConnection = LdapFactory.getSingleConnection(config, true);
         }
-        searchResult = ldapMonoConnection.search(searchRequest);
-      } else {
-        throw new StoreException("search failed", e);
+      } catch (LDAPException e1) {
+        throw new StoreException("Failed to reopen connection", e1);
       }
+      searchResult = ldapMonoConnection.search(searchRequest);
     }
     PageResult<R> pageResult = new PageResult<>();
     pageResult.setResults(