From 843dd99fdd5dcc1154d5693d0058e54b809da60c Mon Sep 17 00:00:00 2001 From: Valerij Fredriksen Date: Tue, 26 Sep 2017 10:34:11 +0200 Subject: Use String as lock key --- .../main/java/com/yahoo/concurrent/classlock/ClassLocking.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'vespajlib') diff --git a/vespajlib/src/main/java/com/yahoo/concurrent/classlock/ClassLocking.java b/vespajlib/src/main/java/com/yahoo/concurrent/classlock/ClassLocking.java index e387d259f26..27b020b578d 100644 --- a/vespajlib/src/main/java/com/yahoo/concurrent/classlock/ClassLocking.java +++ b/vespajlib/src/main/java/com/yahoo/concurrent/classlock/ClassLocking.java @@ -8,7 +8,7 @@ import java.util.function.BooleanSupplier; * @author valerijf */ public class ClassLocking { - private final Map, ClassLock> classLocks = new HashMap<>(); + private final Map classLocks = new HashMap<>(); private final Object monitor = new Object(); public ClassLock lock(Class clazz) { @@ -17,7 +17,7 @@ public class ClassLocking { public ClassLock lockWhile(Class clazz, BooleanSupplier interruptCondition) { synchronized (monitor) { - while (classLocks.containsKey(clazz)) { + while (classLocks.containsKey(clazz.getName())) { try { monitor.wait(); } catch (InterruptedException ignored) { @@ -29,15 +29,15 @@ public class ClassLocking { } ClassLock classLock = new ClassLock(this, clazz); - classLocks.put(clazz, classLock); + classLocks.put(clazz.getName(), classLock); return classLock; } } void unlock(Class clazz, ClassLock classLock) { synchronized (monitor) { - if (classLock.equals(classLocks.get(clazz))) { - classLocks.remove(clazz); + if (classLock.equals(classLocks.get(clazz.getName()))) { + classLocks.remove(clazz.getName()); monitor.notifyAll(); } else { throw new IllegalArgumentException("Lock has already been released"); -- cgit v1.2.3