commit efcc5b3379da2f32748a01f89d78e8cb4a47f966
author Ben Kwa <kenobi@google.com> Tue May 05 21:56:08 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue May 05 21:56:08 2015 +0000
tree b74dc8497977f9d7e30decd49e2683458d815b3a
parent 846e924039b07b944c41d6dbfa1f7832731ba5dd
parent e74007ded3a34d6aaf7dc4fe7f2c18b04b47de3b

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

* commit 'e74007ded3a34d6aaf7dc4fe7f2c18b04b47de3b':
  Clean up error handling in CopyService.

packages/DocumentsUI/src/com/android/documentsui/CopyService.java

diff --git a/packages/DocumentsUI/src/com/android/documentsui/CopyService.java b/packages/DocumentsUI/src/com/android/documentsui/CopyService.java
index 9dd2b20..202402f0 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/CopyService.java
+++ b/packages/DocumentsUI/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);