Commit 533ba976 authored by Tiago Cunha's avatar Tiago Cunha

Protecting against a NPE on user data

parent 7f01c5ed
...@@ -33,12 +33,16 @@ public class DefaultCookieProvider implements CookieProvider { ...@@ -33,12 +33,16 @@ public class DefaultCookieProvider implements CookieProvider {
return ""; return "";
} }
final String userId = realmHelper.executeTransactionForRead(realm -> final User user = realmHelper.executeTransactionForRead(realm ->
User.queryCurrentUser(realm).findFirst()).getId(); User.queryCurrentUser(realm).findFirst());
final String token = realmHelper.executeTransactionForRead(realm -> final Session session = realmHelper.executeTransactionForRead(realm ->
Session.queryDefaultSession(realm).findFirst()).getToken(); Session.queryDefaultSession(realm).findFirst());
return "rc_uid=" + userId + ";rc_token=" + token; if (user == null || session == null) {
return "";
}
return "rc_uid=" + user.getId() + ";rc_token=" + session.getToken();
} }
private String getHostnameFromCache() { private String getHostnameFromCache() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment