0005177: File Sync fails to create zip file when modify, followed by

delete, followed by create is captured and sent in same batch
JumpMind · Dec 29, 2021 · 4bc8f36 · 4bc8f36
1 parent dc759cf
commit 4bc8f36
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/file/FileSyncZipDataWriter.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/file/FileSyncZipDataWriter.java
@@ -209,8 +209,11 @@ public void end(Batch batch, boolean inError) {
                         LastEventType previousEventForEntry = entriesByLastEventType.get(entryName.toString());
                         boolean addFileToZip = true;
                         if (previousEventForEntry != null) {
+                            // There could be a delete between a MODIFY and a CREATE, but the delete is not added to the
+                            // entriesByLastEventType data structure
                             if ((previousEventForEntry == eventType)
-                                    || (previousEventForEntry == LastEventType.CREATE && eventType == LastEventType.MODIFY)) {
+                                    || (previousEventForEntry == LastEventType.CREATE && eventType == LastEventType.MODIFY)
+                                    || (previousEventForEntry == LastEventType.MODIFY && eventType == LastEventType.CREATE)) {
                                 addFileToZip = false;
                             }
                         }