Skip to content
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.

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

[3.7] Fix wrong checks of empty string in LdapUser context #6217

Merged
merged 1 commit into from
Sep 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions Kitodo/src/main/java/org/kitodo/production/ldap/LdapUser.java
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ public static String toHexString(byte[] bytes) {

@Override
public Attributes getAttributes(String name) throws NamingException {
if (StringUtils.isBlank(name)) {
if (StringUtils.isNotBlank(name)) {
throw new NameNotFoundException();
}
return (Attributes) this.attributes.clone();
Expand All @@ -292,7 +292,7 @@ public Attributes getAttributes(Name name) throws NamingException {

@Override
public Attributes getAttributes(String name, String[] ids) throws NamingException {
if (StringUtils.isBlank(name)) {
if (StringUtils.isNotBlank(name)) {
throw new NameNotFoundException();
}

Expand Down
2 changes: 1 addition & 1 deletion Kitodo/src/main/resources/messages/messages_en.properties
Original file line number Diff line number Diff line change
Expand Up @@ -680,7 +680,7 @@ lastPage=Last page
lastUpdatedBy=Last updated by
later=Please try again in a few minutes.
ldapKonfigurationSchreiben=Write LDAP configuration
ldapWritten=LDAP configuration successfully written for user\: ????
ldapWritten=LDAP configuration successfully written for user\:
# ldapgroupSaving is used in ldapgroupEdit.xhtml - line 39
ldapGroupSaving=Saving LDAP group...
ldapGroup=LDAP group
Expand Down