Openfire (master)

• 

  Guus der Kinderen 29 Jun 2022 dc509326bd6b89cabab15d68d773b7b97115479e

  OF-2421: Prevent ConcurrentModificationException in OccupantManager
  A CME has been observed while one thread is modifying the local occupants, while the other is reading from it.
  
  This commit adds a read/write lock that should prevent this.

  • xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/OccupantManager.java (version dc509326bd6b89cabab15d68d773b7b97115479e)
• 

  Guus der Kinderen 29 Jun 2022 80472bdac22ebf40c369f1bafc3830a674b2ae02

  OF-2444: Call 'close' outside of lock
  Calling 'close' will trigger event listeners, that in turn can try to consume queuedConnections. Deadlocks have been observed following this pattern.
  
  This commit calls the 'close' method outside of the mutex, which prevents that problem.

  • xmppserver/src/main/java/org/jivesoftware/openfire/http/HttpSession.java (version 80472bdac22ebf40c369f1bafc3830a674b2ae02)