Fixed crash when an upload is confirmed with no file selected

[pub/Android/ownCloud.git] / src / com / owncloud / android / operations / ChunkedUploadFileOperation.java

diff --git a/src/com/owncloud/android/operations/ChunkedUploadFileOperation.java b/src/com/owncloud/android/operations/ChunkedUploadFileOperation.java
index d38df47..413a76e 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.nio.channels.FileLock;
 import java.util.Random;
 
 import org.apache.commons.httpclient.HttpException;
@@ -46,9 +45,10 @@ public class ChunkedUploadFileOperation extends UploadFileOperation {
     public ChunkedUploadFileOperation(  Account account,
                                         OCFile file,
                                         boolean isInstant, 
-                                        boolean forceOverwrite) {
+                                        boolean forceOverwrite,
+                                        int localBehaviour) {
         
-        super(account, file, isInstant, forceOverwrite);
+        super(account, file, isInstant, forceOverwrite, localBehaviour);
     }
 
     @Override
@@ -56,13 +56,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 +79,6 @@ public class ChunkedUploadFileOperation extends UploadFileOperation {
             }
             
         } finally {
-            if (lock != null)
-                lock.release();
             if (channel != null)
                 channel.close();
             if (raf != null)