Add null check before base64 encoding cookie

Tirasa · Apr 18, 2024 · e2c5933 · e2c5933
1 parent 038d513
commit e2c5933
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/src/main/java/net/tirasa/connid/bundles/ldap/search/PagedSearchStrategy.java b/src/main/java/net/tirasa/connid/bundles/ldap/search/PagedSearchStrategy.java
@@ -116,8 +116,11 @@ public void doSearch(final LdapContext initCtx, final List<String> baseDNs, fina
                 }
 
                 if (LOG.isOk()) {
-                    LOG.ok("Setting paged request control with page size '{0}' and cookie '{1}'", pageSize - records,
-                            cookie != null ? Base64.getEncoder().encodeToString(cookie) : "");
+                    if (cookie != null) {
+                        LOG.ok("Setting paged request control with page size '{0}' and cookie '{1}'",
+                                pageSize - records,
+                                cookie != null ? Base64.getEncoder().encodeToString(cookie) : "");
+                    }
                 }
                 PagedResultsControl pagedResultsControl = new PagedResultsControl(pageSize - records, cookie,
                         Control.CRITICAL);
@@ -150,7 +153,11 @@ public void doSearch(final LdapContext initCtx, final List<String> baseDNs, fina
                         cookie = pagedControl.getCookie();
                         if (LOG.isOk())
                         {
-                            LOG.ok("Server returned a paged results control with cookie '{0}'", Base64.getEncoder().encodeToString(cookie));
+                            if (cookie != null) {
+                                LOG.ok("Server returned a paged results control with cookie '{0}'",
+                                        Base64.getEncoder().encodeToString(cookie));
+                            }
+
                         }
 
                         if (pagedControl.getResultSize() > 0) {