Fix concurrency issue in Equinox Caching

#233 Fix bug in original PR Signed-off-by: Stefan Winkler <[email protected]>
eclipse-equinox · Apr 25, 2023 · d1fbae8 · d1fbae8
1 parent df1bdf7
commit d1fbae8
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/...eaving.caching/src/org/eclipse/equinox/weaving/internal/caching/ClassnameLockManager.java b/...eaving.caching/src/org/eclipse/equinox/weaving/internal/caching/ClassnameLockManager.java
@@ -119,6 +119,11 @@ private Lock acquireLock(final String classname, final boolean writeLock) {
 			return resultingEntry;
 		});
 
+		// now activate the lock - this must happen outside of the compute() because
+		// otherwise we would end up in a deadlock with the classnameLocks
+		// ConcurrentHashMap lock in releaseLock()
+		lockWrapper[0].lock();
+
 		// return the acquired lock
 		return lockWrapper[0];
 	}