Skip to content

fix: resolve concurrency issues with SQLite database handling (for logging) #491

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
R00tB33rMan wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: resolve concurrency issues with SQLite database handling (for logging) #491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion common/src/main/java/net/william278/huskclaims/user/Preferences.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public class Preferences implements AuditLogger {

@Expose
@SerializedName("audit_log")
private Map<String, Entry> logEntries = Maps.newHashMap();
private Map<String, Entry> logEntries = Maps.newConcurrentMap();

@Expose
@SerializedName("claiming_mode")
Expand Down
4 changes: 2 additions & 2 deletions common/src/main/java/net/william278/huskclaims/user/PreferencesSerializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public void write(@NotNull JsonWriter out, @NotNull Preferences prefs) throws IO
private void writeAuditLog(@NotNull JsonWriter out, @NotNull Map<String, AuditLogger.Entry> auditLog) throws IOException {
out.beginObject();
int i = 0;
for (Map.Entry<String, AuditLogger.Entry> entry : auditLog.entrySet()) {
for (Map.Entry<String, AuditLogger.Entry> entry : Map.copyOf(auditLog).entrySet()) {
if (i >= maxPersistedLogEntries) {
break;
}
Expand Down Expand Up @@ -102,7 +102,7 @@ public Preferences read(@NotNull JsonReader in) throws IOException {

@NotNull
private Map<String, AuditLogger.Entry> readAuditLog(@NotNull JsonReader in) throws IOException {
final Map<String, AuditLogger.Entry> auditLog = Maps.newHashMap();
final Map<String, AuditLogger.Entry> auditLog = Maps.newConcurrentMap();
in.beginObject();
while (in.hasNext()) {
auditLog.put(in.nextName(), readAuditLogEntry(in));
Expand Down
Loading