Merge branch 'race-condition'

Stephen Paul Weber created 3 years ago

* race-condition:
  Prevent race condition in loops over all bookmarks

Change summary

src/main/java/eu/siacs/conversations/entities/Account.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

Detailed changes

src/main/java/eu/siacs/conversations/entities/Account.java

@@ -488,7 +488,9 @@ public class Account extends AbstractEntity implements AvatarService.Avatarable
     }
 
     public Collection<Bookmark> getBookmarks() {
-        return this.bookmarks.values();
+        synchronized (this.bookmarks) {
+            return new HashSet<>(this.bookmarks.values());
+        }
     }
 
     public void setBookmarks(Map<Jid, Bookmark> bookmarks) {