From: Matthias Sohn <matthias.sohn@sap.com>
Date: Sun, 4 Aug 2019 22:51:04 +0000 (+0200)
Subject: Fix FileSnapshot#save(long) and FileSnapshot#save(Instant)
X-Git-Tag: v5.1.9.201908210455-r~31
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=275f3da783b025a3e6cfe47eedc7876e911269f3;p=jgit.git

Fix FileSnapshot#save(long) and FileSnapshot#save(Instant)

Use the fallback timestamp resolution as already described in the
javadoc of these methods. Using zero file timestamp resolution doesn't
make sense.

Change-Id: Iaad2a0f99c3be3678e94980a0a368181b6aed38c
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
---

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileSnapshot.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileSnapshot.java
index e81a88451b..77005100ef 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileSnapshot.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileSnapshot.java
@@ -44,7 +44,7 @@
 package org.eclipse.jgit.internal.storage.file;
 
 import static org.eclipse.jgit.util.FS.FileStoreAttributes.FALLBACK_FILESTORE_ATTRIBUTES;
-
+import static org.eclipse.jgit.util.FS.FileStoreAttributes.FALLBACK_TIMESTAMP_RESOLUTION;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.attribute.BasicFileAttributes;
@@ -176,7 +176,7 @@ public class FileSnapshot {
 	public static FileSnapshot save(long modified) {
 		final Instant read = Instant.now();
 		return new FileSnapshot(read, Instant.ofEpochMilli(modified),
-				UNKNOWN_SIZE, Duration.ZERO, MISSING_FILEKEY);
+				UNKNOWN_SIZE, FALLBACK_TIMESTAMP_RESOLUTION, MISSING_FILEKEY);
 	}
 
 	/**
@@ -196,8 +196,8 @@ public class FileSnapshot {
 	 */
 	public static FileSnapshot save(Instant modified) {
 		final Instant read = Instant.now();
-		return new FileSnapshot(read, modified, UNKNOWN_SIZE, Duration.ZERO,
-				MISSING_FILEKEY);
+		return new FileSnapshot(read, modified, UNKNOWN_SIZE,
+				FALLBACK_TIMESTAMP_RESOLUTION, MISSING_FILEKEY);
 	}
 
 	/** Last observed modification time of the path. */
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java
index 16810e0dc3..c30be36dde 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java
@@ -213,13 +213,20 @@ public abstract class FS {
 		private static final Duration UNDEFINED_DURATION = Duration
 				.ofNanos(Long.MAX_VALUE);
 
+		/**
+		 * Fallback filesystem timestamp resolution. The worst case timestamp
+		 * resolution on FAT filesystems is 2 seconds.
+		 */
+		public static final Duration FALLBACK_TIMESTAMP_RESOLUTION = Duration
+				.ofMillis(2000);
+
 		/**
 		 * Fallback FileStore attributes used when we can't measure the
 		 * filesystem timestamp resolution. The last modified time granularity
 		 * of FAT filesystems is 2 seconds.
 		 */
 		public static final FileStoreAttributes FALLBACK_FILESTORE_ATTRIBUTES = new FileStoreAttributes(
-				Duration.ofMillis(2000));
+				FALLBACK_TIMESTAMP_RESOLUTION);
 
 		private static final Map<FileStore, FileStoreAttributes> attributeCache = new ConcurrentHashMap<>();