diff options
| -rw-r--r-- | vespajlib/src/main/java/com/yahoo/concurrent/StripedExecutor.java | 2 | ||||
| -rw-r--r-- | zkfacade/src/main/java/com/yahoo/vespa/curator/stats/ThreadLockStats.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/vespajlib/src/main/java/com/yahoo/concurrent/StripedExecutor.java b/vespajlib/src/main/java/com/yahoo/concurrent/StripedExecutor.java index 3702ed40be0..37b560d1129 100644 --- a/vespajlib/src/main/java/com/yahoo/concurrent/StripedExecutor.java +++ b/vespajlib/src/main/java/com/yahoo/concurrent/StripedExecutor.java @@ -30,7 +30,7 @@ public class StripedExecutor<Key> { /** Creates a new StripedExecutor which delegates to a {@link Executors#newCachedThreadPool(ThreadFactory)}. */ public StripedExecutor() { - this(Executors.newCachedThreadPool(ThreadFactoryFactory.getDaemonThreadFactory(StripedExecutor.class.getName()))); + this(Executors.newCachedThreadPool(ThreadFactoryFactory.getDaemonThreadFactory(StripedExecutor.class.getSimpleName()))); } /** Creates a new StripedExecutor which delegates to the given executor service. */ diff --git a/zkfacade/src/main/java/com/yahoo/vespa/curator/stats/ThreadLockStats.java b/zkfacade/src/main/java/com/yahoo/vespa/curator/stats/ThreadLockStats.java index 70442e4833d..73ce731390d 100644 --- a/zkfacade/src/main/java/com/yahoo/vespa/curator/stats/ThreadLockStats.java +++ b/zkfacade/src/main/java/com/yahoo/vespa/curator/stats/ThreadLockStats.java @@ -189,7 +189,7 @@ public class ThreadLockStats { if (threadAcquiringLockPath == threadHoldingLockPath) { // reentry return; - } else if (threadsAcquiring.contains(threadAcquiringLockPath)) { + } else if (threadsAcquiring.contains(threadHoldingLockPath)) { // deadlock getGlobalLockMetrics(pathToAcquire).incrementDeadlockCount(); logger.warning(errorMessage.toString()); @@ -201,7 +201,7 @@ public class ThreadLockStats { return; } - threadsAcquiring.add(threadHoldingLockPath); + threadsAcquiring.add(threadAcquiringLockPath); lockPath = nextLockPath.get(); threadAcquiringLockPath = threadHoldingLockPath; } |