Merge branch 'master' into bug5258

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

@@ -146,6 +146,13 @@ public class RaceCourseReceiver extends AbstractReceiverWithQueue<IControlRoute,
         int i = 0;
         for (IControl cp : event.getA().getControls()) {
             PassingInstruction passingInstructions = courseWaypointPassingInstructions.containsKey(i) ? courseWaypointPassingInstructions.get(i) : PassingInstruction.None;
+            if (!ttControlPointsForAllOriginalEventControlPoints.containsKey(cp)) {
+                logger.warning("The TracTrac event "+getTracTracEvent()+" with ID "+
+                        getTracTracEvent().getId()+" does not contain the IControl with ID "+
+                        cp.getId()+" which is used by race "+tractracRace.getId()+
+                        ". Adding control point adapter based on race data.");
+                ttControlPointsForAllOriginalEventControlPoints.put(cp,  new ControlPointAdapter(cp));
+            }
             ttControlPoints.add(new Pair<TracTracControlPoint, PassingInstruction>(ttControlPointsForAllOriginalEventControlPoints.get(cp), passingInstructions));
             i++;
         }

java/com.sap.sailing.shared.persistence/src/com/sap/sailing/shared/persistence/impl/DomainObjectFactoryImpl.java

@@ -123,7 +123,9 @@ public class DomainObjectFactoryImpl implements DomainObjectFactory {
             try {
                 final Document deviceIdDocument = dbObject.get(FieldNames.MARK_PROPERTIES_TRACKING_DEVICE_IDENTIFIER.name(), Document.class);
                 final DeviceIdentifier deviceIdentifier = deviceIdDocument == null ? null : loadDeviceId(deviceIdentifierServiceFinder, deviceIdDocument);
-                builder.withDeviceId(deviceIdentifier);
+                if (deviceIdentifier != null) {
+                    builder.withDeviceId(deviceIdentifier);
+                }
             } catch (TransformationException | NoCorrespondingServiceRegisteredException e) {
                 logger.log(Level.WARNING, "Could not load deviceId for MarkProperties", e);
             }

java/com.tractrac.clientmodule/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: TracTrac Client module
 Bundle-SymbolicName: com.tractrac.clientmodule
-Bundle-Version: 3.13.1
+Bundle-Version: 3.13.3
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ClassPath: .,
  lib/TracAPI.jar

java/com.tractrac.clientmodule/README.txt

@@ -16,6 +16,32 @@ It contains also some files:
  - test.sh -> script that compiles the code in the src folder, creates the test.jar library and execute the code of the example.
  - Manifest.txt -> manifest used to create the test.jar file
 
+********************************************
+      TracAPI 3.13.3
+********************************************
+This is a final version. The only difference with the previous version is the JDK used to compile the sources.
+It keeps the backward compatibility.
+
+ Release date: 01/05/2020
+ Build number: dfa0d7732ebb374236628868810547d28a357f92
+
+ 1) Bugs
+
+  - The previous version was compiled using Java 13 (Reported by Axel Uhl, 01/05/2020)
+
+********************************************
+     TracAPI 3.13.2
+********************************************
+This is a final version. It adds fixes some features. It keeps the backward compatibility.
+
+Release date: 30/04/2020
+Build number: 242936347afa7ec28fc8b61996caf92693ab11af
+
+1) Bugs
+
+ - Checking if a control exists before to add it to the route (Reported by Axel Uhl, 24/03/2020)
+ - The EventFactory has to synchronize the access to the "Map of IControls" (Reported by Axel Uhl, 30/04/2020)
+
 ********************************************
      TracAPI 3.13.1
 ********************************************

java/com.tractrac.clientmodule/pom.xml

@@ -8,6 +8,6 @@
     <version>1.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>com.tractrac.clientmodule</artifactId>
-  <version>3.13.1</version>
+  <version>3.13.3</version>
   <packaging>eclipse-plugin</packaging>
 </project>