bug4572: added null-safety in SailingServiceImpl speedWithBearingBeforeManeuverLoss

This commit is contained in:
Alessandro Stoltenberg
2018-07-10 09:58:15 +02:00
parent abbf5e6bc8
commit ecac04d30c
@@ -3632,8 +3632,9 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S
final Date markPassingTimePoint = maneuver.isMarkPassing()
? maneuver.getMarkPassing().getTimePoint().asDate() : null;
final NauticalSide markPassingSide = maneuver.isMarkPassing() ? maneuver.getToSide() : null;
final SpeedWithBearing speedWithBearingBeforeManeuverLoss = maneuver.getManeuverLoss() == null ? null
: maneuver.getManeuverLoss().getSpeedWithBearingBefore();
final SpeedWithBearing speedWithBearingBeforeManeuverLoss = (maneuver.getManeuverLoss() == null
|| maneuver.getManeuverLoss().getSpeedWithBearingBefore() == null) ? null
: maneuver.getManeuverLoss().getSpeedWithBearingBefore();
final Double middleManeuverAngle = maneuver.getManeuverLoss() == null ? null : maneuver.getManeuverLoss().getMiddleManeuverAngle().getDegrees();
final ManeuverLossDTO maneuverLoss = maneuver.getManeuverLoss() == null ? null
: new ManeuverLossDTO(maneuver.getManeuverLoss().getManeuverStartPosition(),