From: Robert Varga <robert.varga@pantheon.tech>
Date: Thu, 2 Mar 2023 11:37:29 +0000 (+0100)
Subject: Synchronize SegmentedJournal.open()
X-Git-Tag: v7.0.5~67
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=2eb8e4e4449d2a9450c78f00428e6d2bf834bea9;p=controller.git

Synchronize SegmentedJournal.open()

SpotBugs is pointing out a problem with synchronization to
currentSegment. This is a false positive, as we only call this method
from the constructor, but slap a synchronized keyword on it anyway.

JIRA: CONTROLLER-2071
Change-Id: Iaf3a13c4122a3321b615eb5629327494165c0bed
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---

diff --git a/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/SegmentedJournal.java b/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/SegmentedJournal.java
index fed7ab8d3e..45490757f8 100644
--- a/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/SegmentedJournal.java
+++ b/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/SegmentedJournal.java
@@ -230,7 +230,7 @@ public final class SegmentedJournal<E> implements Journal<E> {
   /**
    * Opens the segments.
    */
-  private void open() {
+  private synchronized void open() {
     // Load existing log segments from disk.
     for (JournalSegment<E> segment : loadSegments()) {
       segments.put(segment.descriptor().index(), segment);