eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-20 19:20:04 +00:00
Code Activity

bug 3442: fixing NPE when checking if marks are used in other course; if there is no course defined yet, marks are not used

Browse Source 
Change-Id: Ib4d8e8731dce0e84c819eb42fd29765b4e21850d
This commit is contained in:
Axel Uhl committed 2016-01-28 20:38:12 +01:00
1 parent 74b4130338
commit 7f0b8a06d0
2 files changed
+10 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RaceLogCourseManagementWidget.java
+1 -1
View File
@@ -141,7 +141,7 @@ public class RaceLogCourseManagementWidget extends CourseManagementWidget {
@Override
public void onFailure(Throwable caught) {
errorReporter.reportError("Could not load course: " + caught.getMessage());
errorReporter.reportError("Could not load course: " + caught.getMessage(), /* silent */ true);
}
});
}
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
+9 -6
View File
@@ -5996,12 +5996,15 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S
if (raceLog != raceLogToIgnore) {
LastPublishedCourseDesignFinder finder = new LastPublishedCourseDesignFinder(raceLog);
CourseBase course = finder.analyze();
for (Waypoint waypoint: course.getWaypoints()) {
for (Mark mark : waypoint.getMarks()) {
if (markIds.contains(mark.getId().toString())) {
racesContainingMarksToDeleteInCourse.add(raceColumn.getName()+"/"+fleet.getName());
marksAreUsedInOtherRaceLogs = true;
}
if (course != null) {
for (Waypoint waypoint : course.getWaypoints()) {
for (Mark mark : waypoint.getMarks()) {
if (markIds.contains(mark.getId().toString())) {
racesContainingMarksToDeleteInCourse.add(raceColumn.getName() + "/"
+ fleet.getName());
marksAreUsedInOtherRaceLogs = true;
}
}
}
}
}