Small fixes with regards to cleaning

syncany · Aug 13, 2014 · 5ce98fe · 5ce98fe
1 parent c85ae4b
commit 5ce98fe
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/syncany-lib/src/main/java/org/syncany/operations/cleanup/CleanupOperation.java b/syncany-lib/src/main/java/org/syncany/operations/cleanup/CleanupOperation.java
@@ -123,6 +123,8 @@ public CleanupOperationResult execute() throws Exception {
 
 		startOperation();
 
+		transferManager.cleanTransactions(config.getMachineName());
+
 		// Wait two seconds (conservative cleanup, see #104)
 		logger.log(Level.INFO, "Cleanup: Waiting a while to be sure that no other actions are running ...");
 		Thread.sleep(BEFORE_DOUBLE_CHECK_TIME);

diff --git a/syncany-lib/src/main/java/org/syncany/operations/up/UpOperation.java b/syncany-lib/src/main/java/org/syncany/operations/up/UpOperation.java
@@ -112,15 +112,16 @@ public UpOperationResult execute() throws Exception {
 		logger.log(Level.INFO, "Running 'Sync up' at client " + config.getMachineName() + " ...");
 		logger.log(Level.INFO, "--------------------------------------------");
 
-		// TODO [medium/high] Remove this and construct mechanism to resume uploads
-		transferManager.cleanTransactions(config.getMachineName());
 
 		if (!checkPreconditions()) {
 			return result;
 		}
 
 		// Upload action file (lock for cleanup)
 		startOperation();
+
+		// TODO [medium/high] Remove this and construct mechanism to resume uploads
+		transferManager.cleanTransactions(config.getMachineName());
 
 		ChangeSet localChanges = result.getStatusResult().getChangeSet();
 		List<File> locallyUpdatedFiles = extractLocallyUpdatedFiles(localChanges);