Fix error message

This commit is contained in:
2020-12-18 20:11:28 +01:00
parent be8d49ff9e
commit d1c8f24d3d
@@ -111,13 +111,11 @@ public class VotingController {
if (name.strip().toLowerCase().matches("[a-z]+\\.[a-z]+@adolfinum+\\.de$")) { if (name.strip().toLowerCase().matches("[a-z]+\\.[a-z]+@adolfinum+\\.de$")) {
try { try {
LOGGER.warn(name); LOGGER.warn(name);
try {
Voter voter = voterRepository.findByEmail(name.toLowerCase().strip()); Voter voter = voterRepository.findByEmail(name.toLowerCase().strip());
} catch (Exception e){ if (voter == null){
LOGGER.error(name + " is not allowed to vote"); LOGGER.error(name + " is not allowed to vote");
return "errors/notRegistered.html"; return "errors/notRegistered.html";
} }
Voter voter = voterRepository.findByEmail(name.toLowerCase().strip());
if (voter.getVote_status() && votingPhase) { if (voter.getVote_status() && votingPhase) {
LOGGER.warn(name + " has already voted"); LOGGER.warn(name + " has already voted");
return "errors/alreadyVoted.html"; return "errors/alreadyVoted.html";