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

fixed ConflictResolver

Browse Source
This commit is contained in:
Sebastian Stenzel
2016-08-14 14:56:44 +02:00
parent 6730a83cac
commit a18c406cf0
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/ConflictResolver.java
View File

@@ -87,7 +87,7 @@ final class ConflictResolver {
ByteBuffer beginOfFile2 = ByteBuffer.allocate(sampleSize);
int bytesRead1 = r1.read(beginOfFile1);
int bytesRead2 = r2.read(beginOfFile2);
if (bytesRead1 == sampleSize && bytesRead2 == sampleSize) {
if (bytesRead1 == bytesRead2) {
beginOfFile1.flip();
beginOfFile2.flip();
return beginOfFile1.equals(beginOfFile2);