bug4651: added null safety for search in case leaderboard groups belong to no event

Change-Id: Ia8b7705610928e1a58b11cdf9a15c33b41d0efe6
This commit is contained in:
Axel Uhl committed 2018-06-30 18:54:45 +02:00
1 parent 301e25cf1e
commit afaac49c62
1 file changed
+2 -2
@@ -126,12 +126,12 @@ public class RegattaByKeywordSearchService {
*
* @param leaderboard the leaderboard to get the matching events for
* @param leaderboardGroup the LeaderboardGroup hosting the leaderboard
* @param events all events hosting the LeaderboardGroup
* @param events all events hosting the LeaderboardGroup; may be {@code null}; if {@code null}, result will be {@code null}
* @return the best matching events for the given Leaderboard/LeaderboardGroup
*/
private Set<Event> filterEventsForLeaderboard(Leaderboard leaderboard, LeaderboardGroup leaderboardGroup, Set<Event> events) {
final Set<Event> result;
if (leaderboardGroup.hasOverallLeaderboard()) {
if (events != null && leaderboardGroup.hasOverallLeaderboard()) {
CourseArea defaultCourseArea = leaderboard.getDefaultCourseArea();
Set<Event> preResult = null;
if (defaultCourseArea != null) {