motiejus
/
jgit
1
Fork 0
Code Releases Activity

Handle CancellationException in FileStoreAttributeCache 

Change-Id: If5985fbf04f630b1d72a1bafd508e0e15e1436be
This commit is contained in:
Matthias Sohn 2019-07-19 14:43:52 +02:00
parent 72d6e304b8
commit 37f7679fc9
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java
View File

@ -74,6 +74,7 @@
import java.util.Objects; import java.util.Objects;
import java.util.Optional; import java.util.Optional;
import java.util.UUID; import java.util.UUID;
import java.util.concurrent.CancellationException;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
@ -281,7 +282,7 @@ private static Duration getFsTimestampResolution(Path file) {
} }
// return fallback until measurement is finished // return fallback until measurement is finished
} catch (IOException | InterruptedException } catch (IOException | InterruptedException
| ExecutionException e) { | ExecutionException | CancellationException e) {
LOG.error(e.getMessage(), e); LOG.error(e.getMessage(), e);
} catch (TimeoutException | SecurityException e) { } catch (TimeoutException | SecurityException e) {
// use fallback // use fallback