Fixes issue #27

lithnet · May 18, 2018 · 52faff0 · 52faff0
1 parent 8a123aa
commit 52faff0
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/src/Lithnet.Acma.Service/AcmaSyncService.cs b/src/Lithnet.Acma.Service/AcmaSyncService.cs
@@ -86,7 +86,7 @@ public void ExportEnd()
         {
             Logger.WriteLine("Export Complete");
             Logger.WriteSeparatorLine('*');
-          
+
             MAStatistics.StopOperation();
             Logger.WriteLine(MAStatistics.ToString());
         }
@@ -125,22 +125,28 @@ public ImportResponse ImportStart(ImportStartRequest request)
             CachedImportRequest cachedRequest = new CachedImportRequest();
             cachedRequest.Request = request;
 
+            if (cachedRequest.Request.ImportType == OperationType.Delta)
+            {
+                this.ProcessOperationEvents(AcmaEventOperationType.DeltaImport);
+            }
+            else
+            {
+                this.ProcessOperationEvents(AcmaEventOperationType.FullImport);
+            }
+
             byte[] watermark = ActiveConfig.DB.GetHighWatermarkMAObjectsDelta();
             response.Watermark = watermark == null ? null : Convert.ToBase64String(watermark);
             cachedRequest.HighWatermark = watermark;
-
             Logger.WriteLine("Got delta watermark: {0}", response.Watermark);
-           
+
             ResultEnumerator enumerator;
 
             if (cachedRequest.Request.ImportType == OperationType.Delta)
             {
-                this.ProcessOperationEvents(AcmaEventOperationType.DeltaImport);
                 enumerator = ActiveConfig.DB.EnumerateMAObjectsDelta(watermark);
             }
             else
             {
-                this.ProcessOperationEvents(AcmaEventOperationType.FullImport);
                 enumerator = ActiveConfig.DB.EnumerateMAObjects(cachedRequest.Request.Schema.Types.Select(t => t.Name).ToList(), null, null);
             }