Merge branch 'master' into prod

java/com.googlecode.java-diff-utils/src/difflib/DiffUtils.java

@@ -39,7 +39,7 @@ public class DiffUtils {
      * @param revised  the revised text
      * @return the patch describing the difference between the original and revised texts
      */
-    public static <T> Patch<T> diff(List<T> original, List<T> revised) {
+    public static <T> Patch<T> diff(Iterable<T> original, Iterable<T> revised) {
         return DiffUtils.diff(original, revised, new MyersDiff<T>());
     }
 
@@ -51,7 +51,7 @@ public class DiffUtils {
      * @param algorithm the given algorithm
      * @return the patch describing the difference between the original and revised texts
      */
-    public static <T> Patch<T> diff(List<T> original, List<T> revised, DiffAlgorithm<T> algorithm) {
+    public static <T> Patch<T> diff(Iterable<T> original, Iterable<T> revised, DiffAlgorithm<T> algorithm) {
         return algorithm.diff(original, revised);
     }
 

java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RaceTrackerImpl.java

@@ -57,6 +57,13 @@ public class RaceTrackerImpl implements Listener, RaceTracker {
             throws URISyntaxException, MalformedURLException, FileNotFoundException {
         // Read event data from configuration file
         tractracEvent = KeyValue.setup(paramURL);
+        
+        // can happen that tractrac event is null (occurs when there is no internet connection)
+        // so lets raise some meaningful exception
+        if (tractracEvent == null) {
+        	throw new RuntimeException("Connection failed. Could not connect to " + paramURL);
+        }
+        
         // Initialize data controller using live and stored data sources
         controller = new DataController(liveURI, storedURI, this);
         // Start live and stored data streams