Configuration Service: do not save the snapshot in the past. Adjust I…

…D to latest ID + 1
eclipse · Jun 10, 2014 · 36bf0ef · 36bf0ef
1 parent c94d30d
commit 36bf0ef
Showing 1 changed file with 14 additions and 0 deletions.
diff --git a/...iguration/src/main/java/org/eclipse/kura/core/configuration/ConfigurationServiceImpl.java b/...iguration/src/main/java/org/eclipse/kura/core/configuration/ConfigurationServiceImpl.java
@@ -722,6 +722,20 @@ private synchronized long saveSnapshot(List<? extends ComponentConfiguration> co
 		//
 		// Write it to disk: marshall
 		long sid = (new Date()).getTime();
+
+		//
+		// Do not save the snapshot in the past
+		Set<Long> snapshotIDs = getSnapshots();
+		if (snapshotIDs != null && snapshotIDs.size() > 0) {
+			Long[] snapshots = snapshotIDs.toArray( new Long[]{});
+			Long   lastestID = snapshots[snapshotIDs.size()-1];
+
+			if (lastestID != null && sid <= lastestID) {
+				s_logger.warn("Snapshot ID: {} is in the past. Adjusting ID to: {} + 1", sid, lastestID);
+				sid = lastestID + 1;
+			}
+		}
+
 		File fSnapshot = getSnapshotFile(sid);
 		s_logger.info("Writing snapshot - Saving {}...", fSnapshot.getAbsolutePath());
 		try {