Merge branch 'master' into ubilabs--tracking_app--develop

java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java

@@ -407,7 +407,6 @@ public abstract class TrackedRaceImpl extends TrackedRaceWithWindEssentials impl
                     windTracks.putAll(loadedWindTracks);
                     updateEventTimePoints(loadedWindTracks.values());
                     logger.info("Finished loading wind tracks for " + getRace().getName() + ". Found " + windTracks.size() + " wind tracks for this race.");
-                    
                 } finally {
                     synchronized (TrackedRaceImpl.this) {
                         loadingFromWindStoreState = LoadingFromStoresState.FINISHED;
@@ -2880,7 +2879,7 @@ public abstract class TrackedRaceImpl extends TrackedRaceWithWindEssentials impl
                                         (DynamicGPSFixTrack<Competitor, GPSFixMoving>) tracks.get(competitor), log,
                                         competitor);
                             } catch (TransformationException | NoCorrespondingServiceRegisteredException e) {
-                                logger.log(Level.WARNING, "Could not load track for " + competitor);
+                                logger.log(Level.WARNING, "Could not load track for " + competitor, e);
                             }
                         }
                         logger.info("Finished loading competitor tracks for " + getRace().getName());
@@ -2890,7 +2889,7 @@ public abstract class TrackedRaceImpl extends TrackedRaceWithWindEssentials impl
                                 gpsFixStore.loadMarkTrack((DynamicGPSFixTrack<Mark, GPSFix>) markTracks.get(mark), log,
                                         mark);
                             } catch (TransformationException | NoCorrespondingServiceRegisteredException e) {
-                                logger.log(Level.WARNING, "Could not load track for " + mark);
+                                logger.log(Level.WARNING, "Could not load track for " + mark, e);
                             }
                         }
                         logger.info("Finished loading mark tracks for " + getRace().getName());

java/com.sap.sailing.server/src/com/sap/sailing/server/impl/Activator.java

@@ -86,14 +86,22 @@ public class Activator implements BundleActivator {
         context.registerService(RacingEventService.class.getName(), racingEventService, null);
         context.registerService(ClearStateTestSupport.class.getName(), racingEventService, null);
         Dictionary<String, String> properties = new Hashtable<String, String>();
+        final GPSFixMongoHandlerImpl gpsFixMongoHandler = new GPSFixMongoHandlerImpl(racingEventService.getMongoObjectFactory(),
+                racingEventService.getDomainObjectFactory());
         properties.put(TypeBasedServiceFinder.TYPE, GPSFixImpl.class.getName());
         registrations.add(context.registerService(GPSFixMongoHandler.class,
-                        new GPSFixMongoHandlerImpl(racingEventService.getMongoObjectFactory(),
-                                racingEventService.getDomainObjectFactory()), properties));
-        properties.put(TypeBasedServiceFinder.TYPE, GPSFixMovingImpl.class.getName());
+                        gpsFixMongoHandler, properties));
+        // legacy type name; some DBs may still contain fixes marked with this old package name:
+        properties.put(TypeBasedServiceFinder.TYPE, "com.sap.sailing.domain.tracking.impl.GPSFixImpl");
         registrations.add(context.registerService(GPSFixMongoHandler.class,
-                        new GPSFixMovingMongoHandlerImpl(racingEventService.getMongoObjectFactory(),
-                                racingEventService.getDomainObjectFactory()), properties));
+                        gpsFixMongoHandler, properties));
+        final GPSFixMovingMongoHandlerImpl gpsFixMovingMongoHandler = new GPSFixMovingMongoHandlerImpl(racingEventService.getMongoObjectFactory(),
+                racingEventService.getDomainObjectFactory());
+        properties.put(TypeBasedServiceFinder.TYPE, GPSFixMovingImpl.class.getName());
+        registrations.add(context.registerService(GPSFixMongoHandler.class, gpsFixMovingMongoHandler, properties));
+        // legacy type name; some DBs may still contain fixes marked with this old package name:
+        properties.put(TypeBasedServiceFinder.TYPE, "com.sap.sailing.domain.tracking.impl.GPSFixMovingImpl");
+        registrations.add(context.registerService(GPSFixMongoHandler.class, gpsFixMovingMongoHandler, properties));
         // Add an MBean for the service to the JMX bean server:
         RacingEventServiceMXBean mbean = new RacingEventServiceMXBeanImpl(racingEventService);
         MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();

java/com.sap.sse/src/com/sap/sse/osgi/CachedOsgiTypeBasedServiceFinder.java

@@ -37,7 +37,6 @@ public class CachedOsgiTypeBasedServiceFinder<ServiceT> implements ServiceTracke
     @Override
     public ServiceT findService(String type) {
         ServiceT service = services.get(type);
-
         if (service == null) {
             if (fallback != null) {
                 return fallback;
@@ -45,7 +44,6 @@ public class CachedOsgiTypeBasedServiceFinder<ServiceT> implements ServiceTracke
                 throw new NoCorrespondingServiceRegisteredException("Could not find service", type, serviceType.getSimpleName());       
             }
         }
-
         return service;
     }
 
@@ -60,7 +58,6 @@ public class CachedOsgiTypeBasedServiceFinder<ServiceT> implements ServiceTracke
     @Override
     public void modifiedService(ServiceReference<ServiceT> reference, ServiceT service) {
         addingService(reference);
-
     }
 
     @Override