Merge branch 'master' into bug1455

java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/test/DoubleCoercionTest.java

@@ -0,0 +1,12 @@
+package com.sap.sailing.domain.common.test;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+public class DoubleCoercionTest {
+    @Test
+    public void testLongTimesDoubleCoercion() {
+        assertEquals(12l, (long) (15l * 0.5 + 0.5 * 10l));
+    }
+}

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java

@@ -1318,7 +1318,9 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S
                 trackedRace.getRace().getCourse().unlockAfterRead();
             }
         }   
-        raceTimesInfo.currentServerTime = new Date();
+        if (raceTimesInfo != null) {
+            raceTimesInfo.currentServerTime = new Date();
+        }
         return raceTimesInfo;
     }