mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-17 18:21:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

close underlying file, if exception in constructor of CryptoReadableFile or CryptoWritableFile

Browse Source
This commit is contained in:
Sebastian Stenzel
2016-03-05 14:49:46 +01:00
parent 956dd855f9
commit a30b310c04
1 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/CryptoFile.java
View File

@@ -35,7 +35,17 @@ class CryptoFile extends CryptoNode implements File {
@Override
public ReadableFile openReadable() {
boolean authenticate = !fileSystem().delegate().shouldSkipAuthentication(toString());
return new CryptoReadableFile(cryptor.getFileContentCryptor(), forceGetPhysicalFile().openReadable(), authenticate, this::reportAuthError);
ReadableFile physicalReadable = forceGetPhysicalFile().openReadable();
boolean success = false;
try {
final ReadableFile result = new CryptoReadableFile(cryptor.getFileContentCryptor(), physicalReadable, authenticate, this::reportAuthError);
success = true;
return result;
} finally {
if (!success) {
physicalReadable.close();
}
}
}
private void reportAuthError() {
@@ -47,7 +57,17 @@ class CryptoFile extends CryptoNode implements File {
if (parent.folder(name).exists()) {
throw new UncheckedIOException(new FileAlreadyExistsException(toString()));
}
return new CryptoWritableFile(cryptor.getFileContentCryptor(), forceGetPhysicalFile().openWritable());
WritableFile physicalWrtiable = forceGetPhysicalFile().openWritable();
boolean success = false;
try {
final WritableFile result = new CryptoWritableFile(cryptor.getFileContentCryptor(), physicalWrtiable);
success = true;
return result;
} finally {
if (!success) {
physicalWrtiable.close();
}
}
}
@Override