From 8735ad84ff171a104ca02adea3f453e500992cae Mon Sep 17 00:00:00 2001
From: Axel Uhl <axel.uhl@sap.com>
Date: Fri, 27 Nov 2020 20:16:15 +0100
Subject: [PATCH] bug5442: simplified the check for deviceUuid present for
 creating the device mapping

---
 .../sailing/server/gateway/jaxrs/api/RegattasResource.java   | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/RegattasResource.java b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/RegattasResource.java
index 59bc2a7edde..296cef95c8a 100755
--- a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/RegattasResource.java
+++ b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/RegattasResource.java
@@ -575,7 +575,6 @@ public class RegattasResource extends AbstractSailingServerResource {
         if (!getSecurityService().hasCurrentUserUpdatePermission(regatta) && (!skipPermissionChecksBasedOnCorrectRegattaSecretProvided || !regatta.getCompetitorRegistrationType().isOpen())) {
             return getBadRegattaRegistrationTypeErrorResponse(regattaName);
         }
-        boolean checkInCompetitor = false; // whether to create a RegattaLogDeviceCompetitorMappingEvent in the RegattaLog; requires non-null deviceUuid to be provided
         String eCompetitorName = null, eCompetitorShortName = null, eCompetitorEmail = null;
         if (competitorName == null && user == null) {
             return getBadRegattaRegistrationValidationErrorResponse("No competitor name specified and no user authenticated; can't derive competitor name");
@@ -586,7 +585,7 @@ public class RegattasResource extends AbstractSailingServerResource {
         eCompetitorEmail = competitorEmail == null ? user != null ? user.getEmail() : null : competitorEmail;
         // Check regattalog if device has been already registered to this regatta
         boolean duplicateDeviceId = false;
-        if (checkInCompetitor) {
+        if (deviceUuid != null) {
             final RegattaLog regattaLog = regatta.getRegattaLog();
             regattaLog.lockForRead();
             try {
@@ -673,7 +672,7 @@ public class RegattasResource extends AbstractSailingServerResource {
             regatta.registerCompetitor(competitor);
             response = Response.ok(streamingOutput(CompetitorJsonSerializer.create().serialize(competitor)))
                     .header("Content-Type", MediaType.APPLICATION_JSON + ";charset=UTF-8").build();
-            if (checkInCompetitor) {
+            if (deviceUuid != null) {
                 final DeviceIdentifier device = new SmartphoneUUIDIdentifierImpl(UUID.fromString(deviceUuid));
                 final TimePoint now = MillisecondsTimePoint.now();
                 RegattaLogDeviceMappingEventImpl<Competitor> event = new RegattaLogDeviceCompetitorMappingEventImpl(now,