Remove locking of readonly channel

diff --git a/src/com/owncloud/android/operations/ChunkedUploadFileOperation.java b/src/com/owncloud/android/operations/ChunkedUploadFileOperation.java
index d38df47..67ff7ce 100644 (file)
--- a/src/com/owncloud/android/operations/ChunkedUploadFileOperation.java
+++ b/src/com/owncloud/android/operations/ChunkedUploadFileOperation.java
@@ -22,7 +22,6 @@ import java.io.File;
 import java.io.IOException;
 import java.io.RandomAccessFile;
 import java.nio.channels.FileChannel;
 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;
 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;
         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();
         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;
             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 {
             }
             
         } finally {

-            if (lock != null)
-                lock.release();

             if (channel != null)
                 channel.close();
             if (raf != null)
             if (channel != null)
                 channel.close();
             if (raf != null)

diff --git a/src/eu/alefzero/webdav/FileRequestEntity.java b/src/eu/alefzero/webdav/FileRequestEntity.java
index 69643e6..292d88b 100644 (file)
--- a/src/eu/alefzero/webdav/FileRequestEntity.java
+++ b/src/eu/alefzero/webdav/FileRequestEntity.java
@@ -24,7 +24,6 @@ import java.io.OutputStream;
 import java.io.RandomAccessFile;
 import java.nio.ByteBuffer;
 import java.nio.channels.FileChannel;
 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;
 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();
         //                    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();
         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 {
             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();
         }
             channel.close();
             raf.close();
         }