From: Matthias Sohn <matthias.sohn@sap.com>
Date: Wed, 26 Jun 2019 07:10:31 +0000 (+0200)
Subject: FS: ignore AccessDeniedException when measuring timestamp resolution
X-Git-Tag: v5.1.9.201908210455-r~52
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=be66222d1a607ef3feb3b076352e9b8251e0eec2;p=jgit.git

FS: ignore AccessDeniedException when measuring timestamp resolution

It seems on cygwin creating a file under a writable directory can fail
with AccessDeniedException. Log a warning in this case and fallback to
worst case timestamp resolution of 2 seconds.

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

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 64dbf58233..67634cbe78 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java
@@ -56,6 +56,7 @@ import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.PrintStream;
 import java.nio.charset.Charset;
+import java.nio.file.AccessDeniedException;
 import java.nio.file.FileStore;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -312,6 +313,8 @@ public abstract class FS {
 				Duration resolution = Duration.between(t1.toInstant(), t2.toInstant());
 				saveFileTimeResolution(s, resolution);
 				return Optional.of(resolution);
+			} catch (AccessDeniedException e) {
+				LOG.warn(e.getLocalizedMessage(), e); // see bug 548648
 			} catch (IOException | TimeoutException e) {
 				LOG.error(e.getLocalizedMessage(), e);
 			} catch (InterruptedException e) {