Browse Source

Handle CancellationException in FileStoreAttributeCache

Change-Id: If5985fbf04f630b1d72a1bafd508e0e15e1436be
stable-5.1
Matthias Sohn 5 years ago
parent
commit
37f7679fc9
  1. 3
      org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java

3
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.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 @@ public abstract class FS {
} }
// 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

Loading…
Cancel
Save