svn commit: [jahia] r14837 - /trunk/core/src/java/org/jahia/services/cache/simple/SimpleCacheImpl.java

[tdraier]

Author: tdraier
Date: Thu Aug  3 11:39:40 2006
New Revision: 14837

URL: https://svndev.jahia.net/websvn/listing.php?sc=1&rev=14837&repname=jahia
Log:
avoid deadlock

Modified:
    trunk/core/src/java/org/jahia/services/cache/simple/SimpleCacheImpl.java

Modified: 
trunk/core/src/java/org/jahia/services/cache/simple/SimpleCacheImpl.java
URL: 
https://svndev.jahia.net/websvn/diff.php?path=/trunk/core/src/java/org/jahia/services/cache/simple/SimpleCacheImpl.java&rev=14837&repname=jahia
==============================================================================
--- trunk/core/src/java/org/jahia/services/cache/simple/SimpleCacheImpl.java 
(original)
+++ trunk/core/src/java/org/jahia/services/cache/simple/SimpleCacheImpl.java 
Thu Aug  3 11:39:40 2006
@@ -112,9 +112,9 @@
     }
 
     public void flushGroup(String groupName) {
+        Set keysToFlush = new HashSet();
         synchronized (cache) {
             Iterator cacheIter = cache.keySet().iterator();
-            Set keysToFlush = new HashSet();
             while (cacheIter.hasNext()) {
                 Object curCacheKey = cacheIter.next();
                 if (curCacheKey.getClass() == GroupCacheKey.class) {
@@ -130,11 +130,11 @@
                     }
                 }
             }
-            Iterator keyToFlushIter = keysToFlush.iterator();
-            while (keyToFlushIter.hasNext()) {
-                Object curKeyToFlush = keyToFlushIter.next();
-                doRemove(curKeyToFlush);
-            }
+        }
+        Iterator keyToFlushIter = keysToFlush.iterator();
+        while (keyToFlushIter.hasNext()) {
+            Object curKeyToFlush = keyToFlushIter.next();
+            doRemove(curKeyToFlush);
         }
     }