Skip to content

Fix find LdapTemplate, specifying return attributes. #569

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

Fix find LdapTemplate, specifying return attributes. #569

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cfcdfe0
Update LdapTemplate.java
orlandosso Feb 3, 2021
bd75850
Update LdapTemplate.java
orlandosso Feb 4, 2021
ad77df0
Merge pull request #1 from orlandosso/fix-issue-465
orlandosso Feb 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions core/src/main/java/org/springframework/ldap/core/LdapTemplate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1830,8 +1830,10 @@ public <T> List<T> find(Name base, Filter filter, SearchControls searchControls,
}

// extend search controls with the attributes to return
String[] attributes = odm.manageClass(clazz);
searchControls.setReturningAttributes(attributes);
if (isNotCustomReturningAttributes(searchControls)) {
String[] attributes = this.odm.manageClass(clazz);
searchControls.setReturningAttributes(attributes);
}

if (LOG.isDebugEnabled()) {
LOG.debug(String.format("Searching - base=%1$s, finalFilter=%2$s, scope=%3$s", base, finalFilter, searchControls));
Expand Down Expand Up @@ -1877,6 +1879,10 @@ else if (result.size() != 1) {

return result.get(0);
}

private boolean isNotCustomReturningAttributes(SearchControls searchControls) {
return searchControls.getReturningAttributes() == null || searchControls.getReturningAttributes().length == 0;
}

/**
* The status of an authentication attempt.
Expand Down