From 4261d79e517b6a032110b1227dcc366f952e0e1a Mon Sep 17 00:00:00 2001 From: Thad House Date: Sun, 14 Jan 2024 21:53:10 -0800 Subject: [PATCH] Fix using 2 different locks in StructArrayLogEntry --- .../java/edu/wpi/first/util/datalog/StructArrayLogEntry.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wpiutil/src/main/java/edu/wpi/first/util/datalog/StructArrayLogEntry.java b/wpiutil/src/main/java/edu/wpi/first/util/datalog/StructArrayLogEntry.java index b3a31c9a52e..e208f2c0d0d 100644 --- a/wpiutil/src/main/java/edu/wpi/first/util/datalog/StructArrayLogEntry.java +++ b/wpiutil/src/main/java/edu/wpi/first/util/datalog/StructArrayLogEntry.java @@ -87,7 +87,7 @@ public static StructArrayLogEntry create(DataLog log, String name, Struct * @param nelem number of elements */ public void reserve(int nelem) { - synchronized (m_buf) { + synchronized (this) { m_buf.reserve(nelem); } } @@ -121,7 +121,7 @@ public void append(T[] value) { * @param timestamp Time stamp (0 to indicate now) */ public void append(Collection value, long timestamp) { - synchronized (m_buf) { + synchronized (this) { ByteBuffer bb = m_buf.writeArray(value); m_log.appendRaw(m_entry, bb, 0, bb.position(), timestamp); }