- add locks around event list handling

Author: derreisende77

src/main/java/mediathek/gui/tabs/tab_film/EditHistoryDialog.java

@@ -54,7 +54,15 @@ public void windowClosed(WindowEvent e) {
             for (var idx : list.getSelectedIndices()) {
                 changeList.add(list.getModel().getElementAt(idx));
             }
-            changeList.forEach(eventList::remove);
+
+            var lock = eventList.getReadWriteLock().writeLock();
+            lock.lock();
+            try {
+                changeList.forEach(eventList::remove);
+            }
+            finally {
+                lock.unlock();
+            }
             changeList.clear();
         });
 

src/main/java/mediathek/gui/tabs/tab_film/GuiFilme.java

@@ -894,17 +894,23 @@ public SearchHistoryButton(@Nullable SearchControlFieldMode mode) {
                     JPopupMenu popupMenu = new JPopupMenu();
                     popupMenu.add(miClearHistory);
                     popupMenu.add(miEditHistory);
-                    if (!historyList.isEmpty()) {
-                        popupMenu.addSeparator();
-                        for (var item : historyList) {
-                            JMenuItem historyItem = new JMenuItem(item);
-                            historyItem.addActionListener(li -> {
-                                searchField.setText(item);
-                                searchField.fireActionPerformed();
-                            });
-                            popupMenu.add(historyItem);
+                    historyList.getReadWriteLock().readLock().lock();
+                    try {
+                        if (!historyList.isEmpty()) {
+                            popupMenu.addSeparator();
+                            for (var item : historyList) {
+                                JMenuItem historyItem = new JMenuItem(item);
+                                historyItem.addActionListener(li -> {
+                                    searchField.setText(item);
+                                    searchField.fireActionPerformed();
+                                });
+                                popupMenu.add(historyItem);
+                            }
                         }
                     }
+                    finally {
+                        historyList.getReadWriteLock().readLock().unlock();
+                    }
                     popupMenu.show(this, 0, this.getHeight());
                 });
 
@@ -926,7 +932,13 @@ private void loadHistory() {
                         List<String> entries = mapper.readValue(json, new TypeReference<>() {
                         });
                         if (!entries.isEmpty()) {
-                            historyList.addAll(entries);
+                            historyList.getReadWriteLock().writeLock().lock();
+                            try {
+                                historyList.addAll(entries);
+                            }
+                            finally {
+                                historyList.getReadWriteLock().writeLock().unlock();
+                            }
                         }
                     }
                 } catch (JsonProcessingException ex) {
@@ -937,8 +949,14 @@ private void loadHistory() {
             private void saveHistory() {
                 ObjectMapper mapper = new ObjectMapper();
                 try {
-                    var json = mapper.writeValueAsString(historyList);
-                    ApplicationConfiguration.getConfiguration().setProperty(SEARCH_HISTORY_CONFIG, json);
+                    historyList.getReadWriteLock().readLock().lock();
+                    try {
+                        var json = mapper.writeValueAsString(historyList);
+                        ApplicationConfiguration.getConfiguration().setProperty(SEARCH_HISTORY_CONFIG, json);
+                    }
+                    finally {
+                        historyList.getReadWriteLock().readLock().unlock();
+                    }
                 } catch (JsonProcessingException e) {
                     logger.error("Failed to write search history", e);
                 }