mirror of
https://code.briarproject.org/briar/briar.git
synced 2026-02-15 20:29:52 +01:00
@GuardedBy annotations.
This commit is contained in:
@@ -10,6 +10,7 @@ import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
|
||||
import java.util.Locale;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
import javax.annotation.concurrent.GuardedBy;
|
||||
|
||||
import static android.os.Build.VERSION.SDK_INT;
|
||||
import static org.briarproject.briar.android.settings.SettingsFragment.LANGUAGE;
|
||||
@@ -17,7 +18,7 @@ import static org.briarproject.briar.android.settings.SettingsFragment.LANGUAGE;
|
||||
@NotNullByDefault
|
||||
public class Localizer {
|
||||
|
||||
// Locking: class
|
||||
@GuardedBy("Localizer.class")
|
||||
@Nullable
|
||||
private static Localizer INSTANCE;
|
||||
private final Locale systemLocale;
|
||||
|
||||
@@ -9,6 +9,7 @@ import java.util.TimeZone;
|
||||
import java.util.logging.Formatter;
|
||||
import java.util.logging.LogRecord;
|
||||
|
||||
import javax.annotation.concurrent.GuardedBy;
|
||||
import javax.annotation.concurrent.ThreadSafe;
|
||||
|
||||
import static java.util.Locale.US;
|
||||
@@ -18,8 +19,10 @@ import static java.util.Locale.US;
|
||||
public class BriefLogFormatter extends Formatter {
|
||||
|
||||
private final Object lock = new Object();
|
||||
private final DateFormat dateFormat; // Locking: lock
|
||||
private final Date date; // Locking: lock
|
||||
@GuardedBy("lock")
|
||||
private final DateFormat dateFormat;
|
||||
@GuardedBy("lock")
|
||||
private final Date date;
|
||||
|
||||
public BriefLogFormatter() {
|
||||
synchronized (lock) {
|
||||
|
||||
@@ -9,6 +9,7 @@ import java.util.Queue;
|
||||
import java.util.logging.Handler;
|
||||
import java.util.logging.LogRecord;
|
||||
|
||||
import javax.annotation.concurrent.GuardedBy;
|
||||
import javax.annotation.concurrent.ThreadSafe;
|
||||
|
||||
@ThreadSafe
|
||||
@@ -18,7 +19,7 @@ public class CachingLogHandler extends Handler {
|
||||
private static final int MAX_RECENT_RECORDS = 100;
|
||||
|
||||
private final Object lock = new Object();
|
||||
// Locking: lock
|
||||
@GuardedBy("lock")
|
||||
private final Queue<LogRecord> recent = new LinkedList<>();
|
||||
|
||||
@Override
|
||||
|
||||
Reference in New Issue
Block a user