From 2cd884499e5afd9e618f59664311bbdbd3a9a4d7 Mon Sep 17 00:00:00 2001 From: Steffen Schaefer Date: Wed, 9 Oct 2019 14:40:09 +0200 Subject: [PATCH] Bug 5085: Returning an empty object instead of status 404 if a race has no course attached (it's effectively an empty course) --- .../jaxrs/api/CourseConfigurationResource.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/CourseConfigurationResource.java b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/CourseConfigurationResource.java index bf448bd1d84..c564f8cddf9 100644 --- a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/CourseConfigurationResource.java +++ b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/CourseConfigurationResource.java @@ -142,14 +142,15 @@ public class CourseConfigurationResource extends AbstractSailingServerResource { courseBase = courseDesginFinder.analyze(); } + final JSONObject jsonResult; if (courseBase == null) { - return Response.status(Status.NOT_FOUND).entity("No course found for given race.").build(); + jsonResult = new JSONObject(); + } else { + final CourseConfiguration courseConfiguration = getService().getCourseAndMarkConfigurationFactory() + .createCourseConfigurationFromCourse(courseBase, regatta, tags); + jsonResult = courseConfigurationJsonSerializer.serialize(courseConfiguration); } - - final CourseConfiguration courseConfiguration = getService().getCourseAndMarkConfigurationFactory() - .createCourseConfigurationFromCourse(courseBase, regatta, tags); - - return Response.ok(courseConfigurationJsonSerializer.serialize(courseConfiguration).toJSONString()).build(); + return Response.ok(jsonResult.toJSONString()).build(); } @GET