mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-27 09:39:25 +03:00
Code Issues Projects Releases Packages Wiki Activity

Remove locking of readonly channel

Browse source
This commit is contained in:
Bartek Przybylski 2012-10-28 10:24:27 +01:00
parent 92080afefc
commit 47acd9b4c3
2 changed files with 0 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/com/owncloud/android/operations/ChunkedUploadFileOperation.java
View file

@ -22,7 +22,6 @@ import java.io.File;
import java.io.IOException;
import java.io.RandomAccessFile;
import java.nio.channels.FileChannel;
import java.nio.channels.FileLock;
import java.util.Random;
import org.apache.commons.httpclient.HttpException;
@ -56,13 +55,11 @@ public class ChunkedUploadFileOperation extends UploadFileOperation {
int status = -1;
FileChannel channel = null;
FileLock lock = null;
RandomAccessFile raf = null;
try {
File file = new File(getStoragePath());
raf = new RandomAccessFile(file, "r");
channel = raf.getChannel();
//lock = channel.tryLock();
ChunkFromFileChannelRequestEntity entity = new ChunkFromFileChannelRequestEntity(channel, getMimeType(), CHUNK_SIZE, file);
entity.addOnDatatransferProgressListeners(getDataTransferListeners());
long offset = 0;
@ -81,8 +78,6 @@ public class ChunkedUploadFileOperation extends UploadFileOperation {
}
} finally {
if (lock != null)
lock.release();
if (channel != null)
channel.close();
if (raf != null)

3
src/eu/alefzero/webdav/FileRequestEntity.java
View file

@ -24,7 +24,6 @@ import java.io.OutputStream;
import java.io.RandomAccessFile;
import java.nio.ByteBuffer;
import java.nio.channels.FileChannel;
import java.nio.channels.FileLock;
import java.util.Collection;
import java.util.HashSet;
import java.util.Iterator;
@ -94,7 +93,6 @@ public class FileRequestEntity implements RequestEntity {
// globally in some fashionable manner
RandomAccessFile raf = new RandomAccessFile(mFile, "r");
FileChannel channel = raf.getChannel();
FileLock lock = channel.tryLock();
Iterator<OnDatatransferProgressListener> it = null;
long transferred = 0;
long size = mFile.length();
@ -115,7 +113,6 @@ public class FileRequestEntity implements RequestEntity {
throw new RuntimeException("Ugly solution to workaround the default policy of retries when the server falls while uploading ; temporal fix; really", io);
} finally {
lock.release();
channel.close();
raf.close();
}