From b8a3eb059c2c139a64876ab0191d72c24ab6f3ee Mon Sep 17 00:00:00 2001
From: masensio <masensio@solidgear.es>
Date: Wed, 3 Jun 2015 11:09:32 +0200
Subject: [PATCH] Remove exhaust response in RenameRemoteFileOperation

---
 .../files/RenameRemoteFileOperation.java      | 70 ++++++++++---------
 1 file changed, 36 insertions(+), 34 deletions(-)

diff --git a/src/com/owncloud/android/lib/resources/files/RenameRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/RenameRemoteFileOperation.java
index 7f449560..4f27cb69 100644
--- a/src/com/owncloud/android/lib/resources/files/RenameRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/RenameRemoteFileOperation.java
@@ -93,42 +93,44 @@ public class RenameRemoteFileOperation extends RemoteOperation {
                 client.getOwnCloudVersion().isVersionWithForbiddenCharacters());
         
         if (noInvalidChars) {
-        try {
-            if (mNewName.equals(mOldName)) {
-                return new RemoteOperationResult(ResultCode.OK);
-            }
-            
-            // check if a file with the new name already exists
-            if (client.existsFile(mNewRemotePath)) {
-            	return new RemoteOperationResult(ResultCode.INVALID_OVERWRITE);
-            }
-            
-            move = new LocalMoveMethod( client.getWebdavUri() +
-                    WebdavUtils.encodePath(mOldRemotePath),
-            		client.getWebdavUri() + WebdavUtils.encodePath(mNewRemotePath));
-            int status = client.executeMethod(move, RENAME_READ_TIMEOUT, RENAME_CONNECTION_TIMEOUT);
+            try {
+                if (mNewName.equals(mOldName)) {
+                    return new RemoteOperationResult(ResultCode.OK);
+                }
 
-            if (status == 400) {
-				result = new RemoteOperationResult(move.succeeded(),
-						move.getResponseBodyAsString(), status);
-				Log_OC.d(TAG, move.getResponseBodyAsString());
-			} else {
-                move.getResponseBodyAsString(); // exhaust response, although not interesting
-                result = new RemoteOperationResult(move.succeeded(), status,
-                        move.getResponseHeaders());
-                Log_OC.i(TAG, "Rename " + mOldRemotePath + " to " + mNewRemotePath + ": " +
-                        result.getLogMessage());
+                // check if a file with the new name already exists
+                if (client.existsFile(mNewRemotePath)) {
+                    return new RemoteOperationResult(ResultCode.INVALID_OVERWRITE);
+                }
+
+                move = new LocalMoveMethod( client.getWebdavUri() +
+                        WebdavUtils.encodePath(mOldRemotePath),
+                        client.getWebdavUri() + WebdavUtils.encodePath(mNewRemotePath));
+                int status = client.executeMethod(move, RENAME_READ_TIMEOUT,
+                        RENAME_CONNECTION_TIMEOUT);
+
+                if (status == 400) {
+                    result = new RemoteOperationResult(move.succeeded(),
+                            move.getResponseBodyAsString(), status);
+                    Log_OC.d(TAG, move.getResponseBodyAsString());
+                } else {
+                    client.exhaustResponse(move.getResponseBodyAsStream());//exhaust response,
+                                                                         // although not interesting
+                    result = new RemoteOperationResult(move.succeeded(), status,
+                            move.getResponseHeaders());
+                    Log_OC.i(TAG, "Rename " + mOldRemotePath + " to " + mNewRemotePath + ": " +
+                            result.getLogMessage());
+                }
+            } catch (Exception e) {
+                result = new RemoteOperationResult(e);
+                Log_OC.e(TAG, "Rename " + mOldRemotePath + " to " +
+                        ((mNewRemotePath==null) ? mNewName : mNewRemotePath) + ": " +
+                        result.getLogMessage(), e);
+
+            } finally {
+                if (move != null)
+                    move.releaseConnection();
             }
-        } catch (Exception e) {
-            result = new RemoteOperationResult(e);
-            Log_OC.e(TAG, "Rename " + mOldRemotePath + " to " +
-                    ((mNewRemotePath==null) ? mNewName : mNewRemotePath) + ": " +
-                    result.getLogMessage(), e);
-            
-        } finally {
-            if (move != null)
-                move.releaseConnection();
-        }
         } else {
         	result = new RemoteOperationResult(ResultCode.INVALID_CHARACTER_IN_NAME);
         }