Making sure Cursor is closed if exception gets thrown.

wordpress-mobile · Apr 23, 2015 · 5864710 · 5864710
1 parent 003f846
commit 5864710
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/WordPressUtils/src/main/java/org/wordpress/android/util/ImageUtils.java b/WordPressUtils/src/main/java/org/wordpress/android/util/ImageUtils.java
@@ -406,17 +406,17 @@ public static byte[] createThumbnailFromUri(Context context,
         String filePath = null;
         if (imageUri.toString().contains("content:")) {
             String[] projection = new String[] { MediaStore.Images.Media.DATA };
+            Cursor cur = null;
             try {
-                Cursor cur = context.getContentResolver().query(imageUri, projection, null, null, null);
-                if (cur != null) {
-                    if (cur.moveToFirst()) {
-                        int dataColumn = cur.getColumnIndex(MediaStore.Images.Media.DATA);
-                        filePath = cur.getString(dataColumn);
-                    }
-                    cur.close();
+                cur = context.getContentResolver().query(imageUri, projection, null, null, null);
+                if (cur != null && cur.moveToFirst()) {
+                    int dataColumn = cur.getColumnIndex(MediaStore.Images.Media.DATA);
+                    filePath = cur.getString(dataColumn);
                 }
             } catch (IllegalStateException stateException) {
                 Log.d(ImageUtils.class.getName(), "IllegalStateException querying content:" + imageUri);
+            } finally {
+                SqlUtils.closeCursor(cur);
             }
         }