Ensure peekObject is called in the syncrhonization block.

bug: 7019598
Change-Id: If153287078826afc9827ea64364b4fb64f2b3a5f

1 files changed, 25 insertions, 16 deletions

diff --git a/src/com/android/gallery3d/data/DataManager.java b/src/com/android/gallery3d/data/DataManager.java
index 0b4dae2c2..eeab8a885 100644
--- a/src/com/android/gallery3d/data/DataManager.java
+++ b/src/com/android/gallery3d/data/DataManager.java
@@ -156,29 +156,38 @@ public class DataManager {
         mSourceMap.put(source.getPrefix(), source);
     }
 
+    // A common usage of this method is:
+    // synchronized (DataManager.LOCK) {
+    //     MediaObject object = peekMediaObject(path);
+    //     if (object == null) {
+    //         object = createMediaObject(...);
+    //     }
+    // }
     public MediaObject peekMediaObject(Path path) {
         return path.getObject();
     }
 
     public MediaObject getMediaObject(Path path) {
-        MediaObject obj = path.getObject();
-        if (obj != null) return obj;
-
-        MediaSource source = mSourceMap.get(path.getPrefix());
-        if (source == null) {
-            Log.w(TAG, "cannot find media source for path: " + path);
-            return null;
-        }
+        synchronized (LOCK) {
+            MediaObject obj = path.getObject();
+            if (obj != null) return obj;
+
+            MediaSource source = mSourceMap.get(path.getPrefix());
+            if (source == null) {
+                Log.w(TAG, "cannot find media source for path: " + path);
+                return null;
+            }
 
-        try {
-            MediaObject object = source.createMediaObject(path);
-            if (object == null) {
-                Log.w(TAG, "cannot create media object: " + path);
+            try {
+                MediaObject object = source.createMediaObject(path);
+                if (object == null) {
+                    Log.w(TAG, "cannot create media object: " + path);
+                }
+                return object;
+            } catch (Throwable t) {
+                Log.w(TAG, "exception in creating media object: " + path, t);
+                return null;
             }
-            return object;
-        } catch (Throwable t) {
-            Log.w(TAG, "exception in creating media object: " + path, t);
-            return null;
         }
     }