eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-24 13:03:55 +00:00
Code Activity

added null check for at beginning of startanalysis checks for competitor in RibDashboardServiceImpl

Browse Source
This commit is contained in:
Alexander Ries committed 2015-10-02 17:18:18 +02:00
1 parent 9c8bb32df6
commit f752eb8c3b
1 file changed
+14 -11
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/server/RibDashboardServiceImpl.java
+14 -11
View File
@@ -278,20 +278,23 @@ public class RibDashboardServiceImpl extends RemoteServiceServlet implements Rib
@Override
public List<StartAnalysisDTO> getStartAnalysisListForCompetitorIDAndLeaderboardName(String competitorIdAsString,
String leaderboardName) {
List<StartAnalysisDTO> startAnalysisDTOs = new ArrayList<StartAnalysisDTO>();
try {
Competitor competitor = baseDomainFactory.getCompetitorStore().getExistingCompetitorByIdAsString(competitorIdAsString);
List<TrackedRace> trackedRacesForLeaderBoardName = getTrackedRacesFromLeaderboard(leaderboardName);
for (TrackedRace trackedRace : trackedRacesForLeaderBoardName) {
StartAnalysisDTO startAnalysisDTO = startAnalysisCreationController.checkStartAnalysisForCompetitorInTrackedRace(competitor, trackedRace);
if (startAnalysisDTO != null) {
startAnalysisDTOs.add(startAnalysisDTO);
List<StartAnalysisDTO> result = null;
if (competitorIdAsString != null && leaderboardName != null) {
result = new ArrayList<StartAnalysisDTO>();
try {
Competitor competitor = baseDomainFactory.getCompetitorStore().getExistingCompetitorByIdAsString(competitorIdAsString);
List<TrackedRace> trackedRacesForLeaderBoardName = getTrackedRacesFromLeaderboard(leaderboardName);
for (TrackedRace trackedRace : trackedRacesForLeaderBoardName) {
StartAnalysisDTO startAnalysisDTO = startAnalysisCreationController.checkStartAnalysisForCompetitorInTrackedRace(competitor, trackedRace);
if (startAnalysisDTO != null) {
result.add(startAnalysisDTO);
}
}
} catch (NullPointerException e) {
logger.log(Level.INFO, "", e);
}
} catch (NullPointerException e) {
logger.log(Level.INFO, "", e);
}
return startAnalysisDTOs;
return result;
}
@Override