fix incomplete changes in a9bfb4d .

Author: infeo

src/main/java/org/cryptomator/cryptofs/DirectoryIdProvider.java

@@ -11,15 +11,19 @@
 import com.github.benmanes.caffeine.cache.Cache;
 import com.github.benmanes.caffeine.cache.Caffeine;
 import com.github.benmanes.caffeine.cache.LoadingCache;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.inject.Inject;
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.nio.file.Path;
+import java.util.concurrent.CompletionException;
 
 @CryptoFileSystemScoped
 class DirectoryIdProvider {
 
+	private static final Logger LOG = LoggerFactory.getLogger(DirectoryIdProvider.class);
 	private static final int MAX_CACHE_SIZE = 5000;
 
 	private final LoadingCache<Path, String> ids;
@@ -30,7 +34,12 @@ public DirectoryIdProvider(DirectoryIdLoader directoryIdLoader) {
 	}
 
 	public String load(Path dirFilePath) throws IOException {
-		return ids.get(dirFilePath);
+		try {
+			return ids.get(dirFilePath);
+		} catch (CompletionException e) {
+			LOG.warn("Failed to load directory id from {}", dirFilePath, e.getCause());
+			throw (IOException) e.getCause();
+		}
 	}
 
 	/**

src/test/java/org/cryptomator/cryptofs/DirectoryIdLoaderTest.java

@@ -84,10 +84,10 @@ public void testIOExceptionWhenExistingFileIsEmpty() throws IOException {
 		when(provider.newFileChannel(eq(dirFilePath), any())).thenReturn(channel);
 		when(channel.size()).thenReturn(0l);
 
-		UncheckedIOException e = Assertions.assertThrows(UncheckedIOException.class, () -> {
+		var ioException = Assertions.assertThrows(IOException.class, () -> {
 			inTest.load(dirFilePath);
 		});
-		MatcherAssert.assertThat(e.getCause().getMessage(), containsString("Invalid, empty directory file"));
+		MatcherAssert.assertThat(ioException.getMessage(), containsString("Invalid, empty directory file"));
 	}
 
 	@Test
@@ -96,10 +96,10 @@ public void testIOExceptionWhenExistingFileIsTooLarge() throws IOException {
 		when(provider.newFileChannel(eq(dirFilePath), any())).thenReturn(channel);
 		when(channel.size()).thenReturn((long) Integer.MAX_VALUE);
 
-		UncheckedIOException e = Assertions.assertThrows(UncheckedIOException.class, () -> {
+		var ioException = Assertions.assertThrows(IOException.class, () -> {
 			inTest.load(dirFilePath);
 		});
-		MatcherAssert.assertThat(e.getCause().getMessage(), containsString("Unexpectedly large directory file"));
+		MatcherAssert.assertThat(ioException.getMessage(), containsString("Unexpectedly large directory file"));
 	}
 
 }

src/test/java/org/cryptomator/cryptofs/DirectoryIdProviderTest.java

@@ -39,15 +39,14 @@ public void testLoadInvokesLoader() throws IOException {
 	}
 
 	@Test
-	public void testIOExceptionFromLoaderIsWrappedAndRethrown() {
+	public void testIOExceptionFromLoaderIsRethrown() throws IOException {
 		IOException originalIoException = new IOException();
-		when(loader.load(aPath)).thenThrow(new UncheckedIOException(originalIoException));
+		when(loader.load(aPath)).thenThrow(originalIoException);
 
 		IOException e = Assertions.assertThrows(IOException.class, () -> {
 			inTest.load(aPath);
 		});
-		Assertions.assertTrue(e.getCause() instanceof UncheckedIOException);
-		Assertions.assertEquals(originalIoException, e.getCause().getCause());
+		Assertions.assertSame(originalIoException, e);
 	}
 
 	@Test