diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2019-07-19 14:43:52 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2019-07-19 14:45:55 +0200 |
| commit | 37f7679fc956729a5e06509593c7cfc0d5801a2c (patch) | |
| tree | db593f01c5aa83fae4a66cc9f7ccdc3bfc3b6677 /org.eclipse.jgit/src/org/eclipse | |
| parent | 72d6e304b85a310d3ad271e61005eb22190b3f44 (diff) | |
| download | jgit-37f7679fc956729a5e06509593c7cfc0d5801a2c.tar.gz jgit-37f7679fc956729a5e06509593c7cfc0d5801a2c.zip | |
Handle CancellationException in FileStoreAttributeCache
Change-Id: If5985fbf04f630b1d72a1bafd508e0e15e1436be
Diffstat (limited to 'org.eclipse.jgit/src/org/eclipse')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java | 3 |
1 files changed, 2 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 e8570d7417..7a03593aba 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java @@ -74,6 +74,7 @@ import java.util.Map; import java.util.Objects; import java.util.Optional; import java.util.UUID; +import java.util.concurrent.CancellationException; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ExecutionException; @@ -281,7 +282,7 @@ public abstract class FS { } // return fallback until measurement is finished } catch (IOException | InterruptedException - | ExecutionException e) { + | ExecutionException | CancellationException e) { LOG.error(e.getMessage(), e); } catch (TimeoutException | SecurityException e) { // use fallback |