소스 검색

Make sure that adding a vault located at ~/foo is noop when a vault located at /home/user/foo already exists
fixes #1032

Sebastian Stenzel 5 년 전
부모
커밋
67485b76af
1개의 변경된 파일8개의 추가작업 그리고 1개의 파일을 삭제
  1. 8 1
      main/commons/src/main/java/org/cryptomator/common/vaults/VaultListManager.java

+ 8 - 1
main/commons/src/main/java/org/cryptomator/common/vaults/VaultListManager.java

@@ -18,6 +18,7 @@ import org.cryptomator.cryptofs.migration.Migrators;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import java.io.IOException;
+import java.nio.file.Files;
 import java.nio.file.NoSuchFileException;
 import java.nio.file.Path;
 import java.util.Collection;
@@ -67,7 +68,13 @@ public class VaultListManager {
 	}
 	
 	private Optional<Vault> get(Path vaultPath) {
-		return vaultList.stream().filter(v -> v.getPath().equals(vaultPath)).findAny();
+		return vaultList.stream().filter(v -> {
+			try {
+				return Files.isSameFile(vaultPath, v.getPath());
+			} catch (IOException e) {
+				return false;
+			}
+		}).findAny();
 	}
 
 	private Vault create(VaultSettings vaultSettings) {