From 5d839742bead448755d721a95eeb2619c6480d95 Mon Sep 17 00:00:00 2001 From: "Christopher Ronnewinkel (D036654)" Date: Thu, 11 Jun 2015 22:22:25 +0200 Subject: [PATCH] avoid npes due to boat-class with nulled display-name; --- .../src/com/sap/sailing/simulator/impl/PolarDiagramBase.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagramBase.java b/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagramBase.java index 0ec21510298..26a0a4446a0 100644 --- a/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagramBase.java +++ b/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagramBase.java @@ -833,9 +833,9 @@ public class PolarDiagramBase implements PolarDiagram, Serializable { public long getTurnLoss() { // TODO: retrieve values from polar data mining int turnLoss; - if (this.boatClass.getDisplayName().equals(BoatClassMasterdata.EXTREME_40.getDisplayName())) { + if ((this.boatClass.getDisplayName() != null) && (this.boatClass.getDisplayName().equals(BoatClassMasterdata.EXTREME_40.getDisplayName()))) { turnLoss = 2000; - } else if (this.boatClass.getDisplayName().equals(BoatClassMasterdata._5O5.getDisplayName())) { + } else if ((this.boatClass.getDisplayName() != null) && (this.boatClass.getDisplayName().equals(BoatClassMasterdata._5O5.getDisplayName()))) { turnLoss = 5000; } else { turnLoss = 4000; // default value