lsc-project#176: Improving contextRequestControls

Worteks · Nov 12, 2024 · 3308b20 · 3308b20
1 parent 00c6653
commit 3308b20
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/src/main/java/org/lsc/jndi/JndiServices.java b/src/main/java/org/lsc/jndi/JndiServices.java
@@ -1205,23 +1205,20 @@ public byte[] pagination() throws IOException, NamingException {
 	 * Applying request controls such as pageSize and sortedBy for LDAP Context.
 	 */
 	public void contextRequestControls() {
+		List<BasicControl> requestControls = new ArrayList<>();
 		try {
 			// Setting global pageSize variable
 			String pageSizeStr = (String) ctx.getEnvironment().get("java.naming.ldap.pageSize");
 			if (pageSizeStr != null && Integer.parseInt(pageSizeStr) > -1) {
 				pageSize = Integer.parseInt(pageSizeStr);
-				List<PagedResultsControl> requestControls = new ArrayList<>();
 				requestControls.add(new PagedResultsControl(pageSize, Control.CRITICAL));
-				ctx.setRequestControls(requestControls.toArray(new Control[requestControls.size()]));
 			}
-
 			// Setting global sortedBy variable
 			sortedBy = (String) ctx.getEnvironment().get("java.naming.ldap.sortedBy");
 			if (sortedBy != null) {
-				List<SortControl> requestControls = new ArrayList<>();
 				requestControls.add(new SortControl(sortedBy, Control.CRITICAL));
-				ctx.setRequestControls(requestControls.toArray(new Control[requestControls.size()]));
 			}
+			ctx.setRequestControls(requestControls.toArray(new Control[requestControls.size()]));
 		} catch (NamingException | IOException e) {
 			throw new RuntimeException(e);
 		}