diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2019-07-03 23:00:14 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2019-07-17 09:42:15 +0200 |
| commit | 4db39f50742706091ee66207526cc801db40b780 (patch) | |
| tree | 241340cd6f411edcb6e9fd44a178513b09ea8845 | |
| parent | 79ede0c3227b0c5f5d7790b58a0881486e06d7cc (diff) | |
| download | jgit-4db39f50742706091ee66207526cc801db40b780.tar.gz jgit-4db39f50742706091ee66207526cc801db40b780.zip | |
Workaround SecurityException in FS#getFsTimestampResolution
On Android FS#getFsTimestampResolution always throws a
SecurityException, handle this by falling back to the fallback timestamp
resolution.
Bug: 548947
Change-Id: I0ee6cb3c20e189bdc8d488434a930427ad6f2df2
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java | 2 |
1 files changed, 1 insertions, 1 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 a970a7df23..6e3e336e94 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java @@ -281,7 +281,7 @@ public abstract class FS { } catch (IOException | InterruptedException | ExecutionException e) { LOG.error(e.getMessage(), e); - } catch (TimeoutException e) { + } catch (TimeoutException | SecurityException e) { // use fallback } return FALLBACK_TIMESTAMP_RESOLUTION; |