commit 15397a5eb85cc0e525bb09d25d51c202a19e2277
author Ben Kwa <kenobi@google.com> Tue May 05 22:17:30 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue May 05 22:17:30 2015 +0000
tree f77d7557a484e1d2c6f8e8075f9b7d4dddf9568d
parent 089084c2028d59ab3ee02231d290bf09f41b6d56
parent 2d88d499a5f0fcc62a63a29cf373da4fa61b9023

am 0fd9d0ba: am efcc5b33: am e74007de: Merge "Clean up error handling in CopyService." into mnc-dev

* commit '0fd9d0bab7c5e8ca71725b0c7a1fa059196610de':
  Clean up error handling in CopyService.

src/com/android/documentsui/CopyService.java

diff --git a/src/com/android/documentsui/CopyService.java b/src/com/android/documentsui/CopyService.java
index 9dd2b20..202402f 100644
--- a/src/com/android/documentsui/CopyService.java
+++ b/src/com/android/documentsui/CopyService.java
@@ -466,14 +466,12 @@
             srcFile.checkError();
         } catch (IOException e) {
             copyError = e;
-        } finally {
-            if (copyError != null) {
-                try {
-                    dstFile.closeWithError(copyError.getMessage());
-                } catch (IOException e) {
-                    Log.e(TAG, "Error closing destination", e);
-                }
+            try {
+                dstFile.closeWithError(copyError.getMessage());
+            } catch (IOException closeError) {
+                Log.e(TAG, "Error closing destination", closeError);
             }
+        } finally {
             // This also ensures the file descriptors are closed.
             IoUtils.closeQuietly(src);
             IoUtils.closeQuietly(dst);