From 78f5c70ead1ad1ff5467161079afbb7aede71667 Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Sat, 4 May 2019 17:08:21 +0200 Subject: [PATCH] when no regatta is found for a leaderboard name but no secret to skip has been specified either, apply regular security checks instead of failing with an NPE Change-Id: I54a540ec8adb6e1d0d364f5b55302edf068c336f --- .../sailing/server/interfaces/RacingEventService.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/java/com.sap.sailing.server.interface/src/com/sap/sailing/server/interfaces/RacingEventService.java b/java/com.sap.sailing.server.interface/src/com/sap/sailing/server/interfaces/RacingEventService.java index 94f28689894..48d483b9221 100755 --- a/java/com.sap.sailing.server.interface/src/com/sap/sailing/server/interfaces/RacingEventService.java +++ b/java/com.sap.sailing.server.interface/src/com/sap/sailing/server/interfaces/RacingEventService.java @@ -884,10 +884,12 @@ public interface RacingEventService extends TrackedRegattaRegistry, RegattaFetch result = false; } else { Regatta regatta = getRegattaByName(leaderboardName); - if (regatta == null && secret != null) { - logger.warning( - "Attempt to skip security checks using regatta secret \"" + secret + "\" for leaderboard \"" - + leaderboardName + "\", but a regatta with the same name could not be resolved"); + if (regatta == null) { + if (secret != null) { + logger.warning( + "Attempt to skip security checks using regatta secret \"" + secret + "\" for leaderboard \"" + + leaderboardName + "\", but a regatta with the same name could not be resolved"); + } // else regatta not found, but no secret specified either; checks won't be skipped, but no skipping was really requested result = false; } else { result = Util.equalStringsWithEmptyIsNull(regatta.getRegistrationLinkSecret(), secret);