Merge branch 'master' into foiling

Conflicts:
	java/com.sap.sailing.server.test/src/com/sap/sailing/server/impl/MediaMasterDataExportTest.java
	java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java

java/com.sap.sailing.server/META-INF/MANIFEST.MF

@@ -43,7 +43,8 @@ Export-Package: com.sap.sailing.server,
    com.sap.sailing.domain.swisstimingadapter.test,
    com.sap.sailing.gwt.ui.test,
    com.sap.sailing.server.replication.test,
-   com.sap.sailing.domain.racelogtrackingadapter.test",
+   com.sap.sailing.domain.racelogtrackingadapter.test,
+   com.sap.sailing.server.testsupport",
  com.sap.sailing.server.masterdata,
  com.sap.sailing.server.operationaltransformation,
  com.sap.sailing.server.operationaltransformation.racelog,

java/com.sap.sailing.server/src/com/sap/sailing/server/masterdata/MasterDataImporter.java

@@ -38,36 +38,29 @@ public class MasterDataImporter {
                 .createObjectInputStreamResolvingAgainstThisFactory(inputStream);
         racingEventService.createOrUpdateDataImportProgressWithReplication(importOperationId, 0.03,
                 DataImportSubProgress.TRANSFER_STARTED, 0.5);
-
         RaceLogStore raceLogStore = MongoRaceLogStoreFactory.INSTANCE.getMongoRaceLogStore(
                 racingEventService.getMongoObjectFactory(), racingEventService.getDomainObjectFactory());
         RegattaImpl.setOngoingMasterDataImport(new MasterDataImportInformation(raceLogStore));
         ClassLoader oldContextClassLoader = Thread.currentThread().getContextClassLoader();
         Thread.currentThread().setContextClassLoader(racingEventService.getCombinedMasterDataClassLoader());
-
         @SuppressWarnings("unchecked")
         final List<Serializable> competitorIds = (List<Serializable>) objectInputStream.readObject();
-
         if (override) {
             setAllowCompetitorsDataToBeReset(competitorIds);
         }
         // Deserialize Regattas to make sure that Regattas are deserialized before Series
         objectInputStream.readObject();
         TopLevelMasterData topLevelMasterData = (TopLevelMasterData) objectInputStream.readObject();
-
         RegattaImpl.setOngoingMasterDataImport(null);
         Thread.currentThread().setContextClassLoader(oldContextClassLoader);
-        
         // in order to restore all listeners we need to initialize the regatta
         // after the whole object graph has been restored
         for (Regatta regatta : topLevelMasterData.getAllRegattas()) {
             RegattaImpl regattaImpl = (RegattaImpl)regatta;
             regattaImpl.initializeSeriesAfterDeserialize();
         }
-
         racingEventService.createOrUpdateDataImportProgressWithReplication(importOperationId, 0.3,
                 DataImportSubProgress.TRANSFER_COMPLETED, 0.5);
-
         applyMasterDataImportOperation(topLevelMasterData, importOperationId, override);
     }
 
@@ -84,10 +77,8 @@ public class MasterDataImporter {
     private MasterDataImportObjectCreationCount applyMasterDataImportOperation(TopLevelMasterData topLevelMasterData,
             UUID importOperationId, boolean override) {
         MasterDataImportObjectCreationCountImpl creationCount = new MasterDataImportObjectCreationCountImpl();
-        ImportMasterDataOperation op = new ImportMasterDataOperation(topLevelMasterData, importOperationId, override,
-                creationCount);
+        ImportMasterDataOperation op = new ImportMasterDataOperation(topLevelMasterData, importOperationId, override, creationCount);
         creationCount = racingEventService.apply(op);
-        racingEventService.mediaTracksImported(topLevelMasterData.getFilteredMediaTracks(), override);
         return creationCount;
     }
 

java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/ImportMasterDataOperation.java

@@ -128,6 +128,7 @@ public class ImportMasterDataOperation extends
                 importDeviceConfigurations(toState);
             }
             dataImportLock.getProgress(importOperationId).setResult(creationCount);
+            toState.mediaTracksImported(masterData.getFilteredMediaTracks(), override);
             return creationCount;
         } catch (Exception e) {
             logger.severe("Error during execution of ImportMasterDataOperation");