summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArne H Juul <arnej27959@users.noreply.github.com>2022-12-22 11:40:34 +0100
committerGitHub <noreply@github.com>2022-12-22 11:40:34 +0100
commit52ad2e23f3dfda9e89302597fc8c96e4a4ef5a32 (patch)
tree78ec487ce25a4422c9e1dc9199fa2e725530d3c5
parent93822f4da059d7507d852f186b6d5d9b1653920d (diff)
parent86cc4dbe024a876a191dc0a523250243df16d211 (diff)
Merge pull request #25332 from vespa-engine/arnej/synchronize-slobrok-mirror-events
avoid ConcurrentModificationException
-rw-r--r--jrt/src/com/yahoo/jrt/slobrok/api/Mirror.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/jrt/src/com/yahoo/jrt/slobrok/api/Mirror.java b/jrt/src/com/yahoo/jrt/slobrok/api/Mirror.java
index 7e3a1b570c5..0835f0b3997 100644
--- a/jrt/src/com/yahoo/jrt/slobrok/api/Mirror.java
+++ b/jrt/src/com/yahoo/jrt/slobrok/api/Mirror.java
@@ -369,7 +369,7 @@ public class Mirror implements IMirror {
int idx = 0;
List<Event> firstEvents = new ArrayList<>();
List<Event> lastEvents = new ArrayList<>();
- void addEvent(String message) {
+ synchronized void addEvent(String message) {
var event = new Event(message);
if (firstEvents.size() < 10) {
firstEvents.add(event);
@@ -384,7 +384,7 @@ public class Mirror implements IMirror {
long tt = (long)(now - (nanos - e.timestamp) / 1.0e9);
log.info("event at [" + tt + "]: " + e.message);
}
- void dump() {
+ synchronized void dump() {
long nanos = System.nanoTime();
double now = System.currentTimeMillis() / 1000.0;
log.info("initial events for location broker mirror");