From a22a14aaa729cce563007890aeeab179edadd893 Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Thu, 27 Sep 2012 09:43:50 +0200 Subject: [PATCH] avoid further NPEs due to disparity between isTracked and trackedRace == null --- .../gwt/ui/adminconsole/TrackedRacesListComposite.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/TrackedRacesListComposite.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/TrackedRacesListComposite.java index 015b244ca62..33bff756e4d 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/TrackedRacesListComposite.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/TrackedRacesListComposite.java @@ -297,7 +297,7 @@ public class TrackedRacesListComposite extends SimplePanel implements Component< TextColumn hasWindDataColumn = new TextColumn() { @Override public String getValue(RaceDTO raceDTO) { - if (raceDTO.isTracked && raceDTO.trackedRace.hasWindData == true) + if (raceDTO.isTracked && raceDTO.trackedRace != null && raceDTO.trackedRace.hasWindData == true) return stringMessages.yes(); else return stringMessages.no(); @@ -307,7 +307,7 @@ public class TrackedRacesListComposite extends SimplePanel implements Component< TextColumn hasGPSDataColumn = new TextColumn() { @Override public String getValue(RaceDTO raceDTO) { - if (raceDTO.isTracked && raceDTO.trackedRace.hasGPSData == true) + if (raceDTO.isTracked && raceDTO.trackedRace != null && raceDTO.trackedRace.hasGPSData == true) return stringMessages.yes(); else return stringMessages.no();