Require write lock when creating directory id.

Author: dkocher

cryptomator/src/main/java/ch/cyberduck/core/cryptomator/impl/CryptoDirectoryUVFProvider.java

@@ -176,11 +176,15 @@ protected int loadRevision(final Session<?> session, final Path directory) throw
 
     @Override
     public byte[] createDirectoryId(final Path directory) {
-        final byte[] dirId = new byte[32];
-        random.nextBytes(dirId);
-        //TODO lock?
-        cache.put(new SimplePathPredicate(directory), dirId);
-        return dirId;
-
+        lock.writeLock().lock();
+        try {
+            final byte[] dirId = new byte[32];
+            random.nextBytes(dirId);
+            cache.put(new SimplePathPredicate(directory), dirId);
+            return dirId;
+        }
+        finally {
+            lock.writeLock().unlock();
+        }
     }
 }

cryptomator/src/main/java/ch/cyberduck/core/cryptomator/impl/CryptoDirectoryV6Provider.java

@@ -54,7 +54,7 @@ public class CryptoDirectoryV6Provider implements CryptoDirectory {
     private final RandomStringService random
             = new UUIDRandomStringService();
 
-    private final ReadWriteLock lock = new ReentrantReadWriteLock();
+    protected final ReadWriteLock lock = new ReentrantReadWriteLock();
 
     protected final LRUCache<CacheReference<Path>, byte[]> cache = LRUCache.build(
             PreferencesFactory.get().getInteger("cryptomator.cache.size"));
@@ -107,8 +107,8 @@ protected byte[] toDirectoryId(final Session<?> session, final Path directory) t
         if(new SimplePathPredicate(home).test(directory)) {
             return ROOT_DIR_ID;
         }
+        lock.readLock().lock();
         try {
-            lock.readLock().lock();
             if(cache.contains(new SimplePathPredicate(directory))) {
                 return cache.get(new SimplePathPredicate(directory));
             }
@@ -145,8 +145,8 @@ protected byte[] load(final Session<?> session, final Path directory) throws Bac
     }
 
     public void delete(final Path directory) {
+        lock.writeLock().lock();
         try {
-            lock.writeLock().lock();
             cache.remove(new SimplePathPredicate(directory));
         }
         finally {
@@ -156,8 +156,8 @@ public void delete(final Path directory) {
 
     @Override
     public void destroy() {
+        lock.writeLock().lock();
         try {
-            lock.writeLock().lock();
             cache.clear();
         }
         finally {
@@ -176,9 +176,14 @@ public byte[] getOrCreateDirectoryId(final Session<?> session, final Path file)
 
     @Override
     public byte[] createDirectoryId(final Path directory) {
-        final byte[] directoryId = random.random().getBytes(StandardCharsets.US_ASCII);
-        //TODO lock?
-        cache.put(new SimplePathPredicate(directory), directoryId);
-        return directoryId;
+        lock.writeLock().lock();
+        try {
+            final byte[] directoryId = random.random().getBytes(StandardCharsets.US_ASCII);
+            cache.put(new SimplePathPredicate(directory), directoryId);
+            return directoryId;
+        }
+        finally {
+            lock.writeLock().unlock();
+        }
     }
 }