commit | e9a9baa151e09bfb4a99bc141a64fa4163398384 | [log] [tgz] |
---|---|---|
author | Marcin Czech <maczech@gmail.com> | Wed Dec 15 13:07:29 2021 +0100 |
committer | Marcin Czech <maczech@gmail.com> | Wed Dec 15 13:07:29 2021 +0100 |
tree | 7bbf259e804bfd1998e647abf8651fe4f53bf517 | |
parent | c1ca6a352ca4eff428d300a574a39dcd0803004b [diff] | |
parent | f8b165ae19dd4c0d1bd2082879a0efa61f5c8db4 [diff] |
Merge branch 'stable-3.1' into stable-3.2 * stable-3.1: Fix issue with skipping events from high-availability Change-Id: Ibd447174c13315db47d8c9c5d0b8197e54a73e88
diff --git a/src/main/java/com/googlesource/gerrit/plugins/multisite/forwarder/ForwarderTask.java b/src/main/java/com/googlesource/gerrit/plugins/multisite/forwarder/ForwarderTask.java index 329b5cb..c5706a5 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/multisite/forwarder/ForwarderTask.java +++ b/src/main/java/com/googlesource/gerrit/plugins/multisite/forwarder/ForwarderTask.java
@@ -15,9 +15,9 @@ package com.googlesource.gerrit.plugins.multisite.forwarder; public abstract class ForwarderTask implements Runnable { - private final Thread callerThread = Thread.currentThread(); + private final String callerThreadName = Thread.currentThread().getName(); - public Thread getCallerThread() { - return callerThread; + public String getCallerThreadName() { + return callerThreadName; } }
diff --git a/src/main/java/com/googlesource/gerrit/plugins/multisite/forwarder/broker/BrokerForwarder.java b/src/main/java/com/googlesource/gerrit/plugins/multisite/forwarder/broker/BrokerForwarder.java index 3522731..975916a 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/multisite/forwarder/broker/BrokerForwarder.java +++ b/src/main/java/com/googlesource/gerrit/plugins/multisite/forwarder/broker/BrokerForwarder.java
@@ -35,7 +35,7 @@ } protected boolean currentThreadBelongsToHighAvailabilityPlugin(ForwarderTask task) { - String currentThreadName = task.getCallerThread().getName(); + String currentThreadName = task.getCallerThreadName(); return currentThreadName.contains(HIGH_AVAILABILITY_PLUGIN) || currentThreadName.contains(HIGH_AVAILABILITY_FORWARDER)