Commit 650fd11d by Juho Juopperi

Don't fall on NullPointerException if returned EventUser is null.

1 parent 53a1a870
......@@ -1143,10 +1143,12 @@ public class UserBean implements UserBeanLocal {
EventUser eventUser = eventUserFacade.findByTokenCode(code);
// Event mismatch?
Integer eventId = eventUser.getEvent().getId();
Integer currentEventId = eventBean.getCurrentEvent().getId();
if (eventId != currentEventId) {
throw new IllegalStateException("Looked up code " + code + " and got EventUser " + eventUser.getId() + " from event " + eventId + " which is not the current event " + currentEventId);
if (eventUser != null) {
Integer eventId = eventUser.getEvent().getId();
Integer currentEventId = eventBean.getCurrentEvent().getId();
if (eventId != currentEventId) {
throw new IllegalStateException("Looked up code " + code + " and got EventUser " + eventUser.getId() + " from event " + eventId + " which is not the current event " + currentEventId);
}
}
return eventUser;
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!