Skip to content
Snippets Groups Projects
Commit b7cdc7f5 authored by Florian Spreckelsen's avatar Florian Spreckelsen
Browse files

Merge branch 'f-null-pointer-list-users' into 'dev'

F null pointer list users

See merge request !116
parents 473adc6b 0c188cad
No related branches found
No related tags found
2 merge requests!117Release 0.12.2,!116F null pointer list users
Pipeline #48688 passed
......@@ -17,6 +17,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed
* Unknown error when trying to access the user list.
[linkahead-server#250](https://gitlab.com/linkahead/linkahead-server/-/issues/250)
* Legacy integer ids are incremented by 1 again, not by 2.
### Security
......
......@@ -54,7 +54,7 @@ public class MySQLListUsers extends MySQLTransaction implements ListUsersImpl {
user.realm = rs.getString("realm");
user.email = rs.getString("email");
user.entity = rs.getString("entity");
if (user.entity.isBlank() || user.entity.equals("0")) {
if (user.entity == null || user.entity.isBlank() || user.entity.equals("0")) {
user.entity = null;
}
user.status = UserStatus.valueOf(rs.getString("status"));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment