| commit | 7393287999d280a300f7c508a2f80e6a6b373a93 | [log] [tgz] |
|---|---|---|
| author | Marcin Czech <maczech@gmail.com> | Wed Dec 15 13:03:26 2021 +0100 |
| committer | Marcin Czech <maczech@gmail.com> | Wed Dec 15 13:03:26 2021 +0100 |
| tree | 5c16bbf20561768a6bd41e96e4fee02f95d1e296 | |
| parent | e78a08c5de939c711a54e11f091e017edae608b7 [diff] | |
| parent | 9829031ee9dd47600bfc1749d99f2737ac349d64 [diff] |
Merge branch 'stable-2.16' into stable-3.0 * stable-2.16: Fix issue with skipping events from high-availability Change-Id: Iff4ef4a6cc071ca932c54b4facdd9eb213d3261e
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)