Index: src/main/java/org/apache/jackrabbit/core/state/FineGrainedISMLocking.java =================================================================== --- src/main/java/org/apache/jackrabbit/core/state/FineGrainedISMLocking.java (revision 1165520) +++ src/main/java/org/apache/jackrabbit/core/state/FineGrainedISMLocking.java (working copy) @@ -385,9 +385,11 @@ } for (int i = 0; i < slots.length; i++) { Map locks = slots[i]; - for (ItemId id : locks.keySet()) { - if (FineGrainedISMLocking.hasDependency(changes, id)) { - return true; + synchronized (locks) { + for (ItemId id : locks.keySet()) { + if (FineGrainedISMLocking.hasDependency(changes, id)) { + return true; + } } } }