From e102bbed995f0e6d3a1a8e5db6d08f9804fd3260 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Mon, 7 Oct 2019 19:05:07 +0200 Subject: [PATCH] Prepend hostname to subsection used to store file timestamp resolution This ensures the measured filesystem timestamp resolution will be only used on the machine where it was measured and avoid errors in case the ~/.jgitconfig file is copied to another machine. Bug: 551850 Change-Id: Iff2a11be62ca94c3bbe4a955182988dc50852f9f Signed-off-by: Matthias Sohn --- org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 b3d01d3b4..0aa0e3668 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java @@ -244,8 +244,9 @@ public abstract class FS { background.set(async); } - private static final String javaVersionPrefix = System - .getProperty("java.vendor") + '|' //$NON-NLS-1$ + private static final String javaVersionPrefix = SystemReader + .getInstance().getHostname() + '|' + + System.getProperty("java.vendor") + '|' //$NON-NLS-1$ + System.getProperty("java.version") + '|'; //$NON-NLS-1$ private static final Duration FALLBACK_MIN_RACY_INTERVAL = Duration