From d2966967bbaa35226d9992dbbb751e217ba29c48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Hessenm=C3=BCller?= Date: Mon, 9 Mar 2020 16:12:18 +0100 Subject: [PATCH] bug2964: Fixed exception when creating CompetitorEditDialog with a null competitor --- .../sap/sailing/gwt/ui/adminconsole/CompetitorEditDialog.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/CompetitorEditDialog.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/CompetitorEditDialog.java index 68237f0346c..bc6bae99dfb 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/CompetitorEditDialog.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/CompetitorEditDialog.java @@ -117,7 +117,8 @@ public abstract class CompetitorEditDialog this.imageUrlAndUploadComposite = new URLFieldWithFileUpload(stringMessages); this.imageUrlAndUploadComposite.setURL(competitorToEdit.getImageURL()); this.yardstickLabel = new Label(stringMessages.yardstickNumber(yardstickScale)); - this.yardstickNumber = createDoubleBox(convertYardstickTimeOnTime(competitorToEdit.getTimeOnTimeFactor(), yardstickScale), 10); + this.yardstickNumber = createDoubleBox(competitorToEdit.getTimeOnTimeFactor() == null ? null + : convertYardstickTimeOnTime(competitorToEdit.getTimeOnTimeFactor(), yardstickScale), 10); Button yardstickScaleButton = new Button(SafeHtmlUtils.fromSafeConstant(stringMessages.changeScale())); yardstickScaleButton.getElement().getStyle().setMarginLeft(3, Unit.PX); yardstickScaleButton.addClickHandler(event -> {