Working upload of photos (individual and zip)

[photos] / src / main / java / org / wamblee / photos / model / filesystem / FileSystemAlbum.java

diff --git a/src/main/java/org/wamblee/photos/model/filesystem/FileSystemAlbum.java b/src/main/java/org/wamblee/photos/model/filesystem/FileSystemAlbum.java
index bfff860137c6ad68fafd4e9d3f0ec67436adc2a7..fcf4695311ae4e1ea4a03e0f6a0abe37ea31e530 100644 (file)
--- a/src/main/java/org/wamblee/photos/model/filesystem/FileSystemAlbum.java
+++ b/src/main/java/org/wamblee/photos/model/filesystem/FileSystemAlbum.java
@@ -119,7 +119,7 @@ public class FileSystemAlbum implements Album {
      *
      * @param aDir   Directory where the album is located.
      * @param aPath  Path that this album represents.
-     * @param aCache Cache to use.
+     * @param aCache Cache to use. Note that a cache usedin one album hierarachy should not be used in another.
      * @throws IOException
      */
     public FileSystemAlbum(File aDir, String aPath, Cache<String, ArrayList<PhotoEntry>> aCache) throws IOException {
@@ -129,7 +129,7 @@ public class FileSystemAlbum implements Album {
         }
         _dir = aDir;
         _path = aPath;
-        _entries = new CachedObject<String, ArrayList<PhotoEntry>>(aCache, aPath, new AlbumComputation(this));
+        _entries = new CachedObject<String, ArrayList<PhotoEntry>>(aCache, "fs:" + aPath, new AlbumComputation(this));
     }
 
     /**