#176: Moved requestControls before seach and nullify in try-catch-fin…

…ally.
lsc-project · Nov 12, 2024 · 00c6653 · 00c6653
1 parent 64e3dac
commit 00c6653
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/src/main/java/org/lsc/jndi/JndiServices.java b/src/main/java/org/lsc/jndi/JndiServices.java
@@ -237,9 +237,6 @@ private void initConnection()
 			throw new NamingException(e.getMessage());
 		}
 
-		// Setting global pageSize and sortedBy variable
-		contextRequestControls();
-
 		String recursiveDeleteStr = (String) ctx.getEnvironment().get("java.naming.recursivedelete");
 		if (recursiveDeleteStr != null) {
 			recursiveDelete = Boolean.parseBoolean(recursiveDeleteStr);
@@ -741,6 +738,7 @@ private List<String> doGetDnList(final String base, final String filter,
 		NamingEnumeration<SearchResult> ne = null;
 		List<String> list = new ArrayList<String>();
 		try {
+			contextRequestControls();
 			SearchControls sc = new SearchControls();
 			sc.setDerefLinkFlag(false);
 			sc.setReturningAttributes(new String[]{"1.1"});
@@ -758,14 +756,15 @@ private List<String> doGetDnList(final String base, final String filter,
 				}
 				pagedResultsResponse = pagination();
 			} while (pagedResultsResponse != null);
-			contextRequestControls();
 		} catch (NamingException e) {
 			LOGGER.error(e.toString());
 			LOGGER.debug(e.toString(), e);
 			throw e;
 		} catch (IOException e) {
 			LOGGER.error(e.toString());
 			LOGGER.debug(e.toString(), e);
+		} finally {
+			ctx.setRequestControls(null);
 		}
 		return list;
 	}
@@ -1138,6 +1137,7 @@ public Map<String, LscDatasets> doGetAttrsList(final String base,
 		constraints.setReturningObjFlag(true);
 		try {
 			byte[] pagedResultsResponse;
+			contextRequestControls();
 			do {
 				NamingEnumeration<SearchResult> results = ctx.search(searchBase, searchFilter, constraints);
 
@@ -1162,18 +1162,18 @@ public Map<String, LscDatasets> doGetAttrsList(final String base,
 
 				pagedResultsResponse = pagination();
 			} while (pagedResultsResponse != null);
-			contextRequestControls();
-        } catch (CommunicationException e) {
+        }
+		catch (CommunicationException e) {
             // Avoid handling the communication exception as a generic one
             throw e;
         } catch (ServiceUnavailableException e) {
             // Avoid handling the service unavailable exception as a generic one
             throw e;
 		} catch (NamingException | IOException e) {
-			// clear requestControls for future use of the JNDI context
-			contextRequestControls();
 			LOGGER.error(e.toString());
 			LOGGER.debug(e.toString(), e);
+		} finally {
+			ctx.setRequestControls(null);
 		}
 		return res;
 	}