Openfire (master)

• 

  Guus der Kinderen 28 Aug 2020 c7d154ba3e4fac5d24c15442b54c15279848f242

  OF-2071: 'Lock' should be locked in front of a 'try' block (instead of in to block).
  And for good measure, replace usage of the deprecated CacheFactory#getLock with Cache#getLock

  • xmppserver/src/main/java/org/jivesoftware/openfire/SessionManager.java (version c7d154ba3e4fac5d24c15442b54c15279848f242)
  • xmppserver/src/main/java/org/jivesoftware/openfire/disco/IQDiscoInfoHandler.java (version c7d154ba3e4fac5d24c15442b54c15279848f242)
  • xmppserver/src/main/java/org/jivesoftware/openfire/disco/IQDiscoItemsHandler.java (version c7d154ba3e4fac5d24c15442b54c15279848f242)
  • xmppserver/src/main/java/org/jivesoftware/openfire/handler/PresenceUpdateHandler.java (version c7d154ba3e4fac5d24c15442b54c15279848f242)
  • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/CachingPubsubPersistenceProvider.java (version c7d154ba3e4fac5d24c15442b54c15279848f242)
  • xmppserver/src/main/java/org/jivesoftware/openfire/server/OutgoingSessionPromise.java (version c7d154ba3e4fac5d24c15442b54c15279848f242)
  • xmppserver/src/main/java/org/jivesoftware/openfire/server/ServerDialback.java (version c7d154ba3e4fac5d24c15442b54c15279848f242)
  • xmppserver/src/main/java/org/jivesoftware/openfire/spi/PresenceManagerImpl.java (version c7d154ba3e4fac5d24c15442b54c15279848f242)
  • xmppserver/src/main/java/org/jivesoftware/openfire/spi/RoutingTableImpl.java (version c7d154ba3e4fac5d24c15442b54c15279848f242)
  • xmppserver/src/main/java/org/jivesoftware/util/AutoCloseableReentrantLock.java (version c7d154ba3e4fac5d24c15442b54c15279848f242)
  • xmppserver/src/main/java/org/jivesoftware/util/cache/CacheUtil.java (version c7d154ba3e4fac5d24c15442b54c15279848f242)
  • xmppserver/src/main/java/org/jivesoftware/util/cache/DefaultLocalCacheStrategy.java (version c7d154ba3e4fac5d24c15442b54c15279848f242)
• 

  Greg Thomas <greg.d.thomas@gmail.com> 28 Aug 2020 d61d78fa4467afb430f3d2b3777f3f6db5f30503

  OF-2068: Display the versions of the various servers and plugins in the cluster

  • i18n/src/main/resources/openfire_i18n.properties (version d61d78fa4467afb430f3d2b3777f3f6db5f30503)
  • xmppserver/src/main/java/org/jivesoftware/openfire/cluster/GetClusteredVersions.java (version d61d78fa4467afb430f3d2b3777f3f6db5f30503)
  • xmppserver/src/main/webapp/system-clustering.jsp (version d61d78fa4467afb430f3d2b3777f3f6db5f30503)
• 

  Guus der Kinderen 28 Aug 2020 3922348dcbe3280dd031e5cbfd7ea3c465b70398

  OF-2064: Invoke IQResultListener on other cluster nodes
  If an IQ result can't be processed locally, try to identify another cluster node that can.

  • xmppserver/src/main/java/org/jivesoftware/openfire/IQRouter.java (version 3922348dcbe3280dd031e5cbfd7ea3c465b70398)
  • xmppserver/src/main/java/org/jivesoftware/openfire/cluster/IQResultListenerTask.java (version 3922348dcbe3280dd031e5cbfd7ea3c465b70398)
  • xmppserver/src/main/java/org/jivesoftware/util/cache/CacheFactory.java (version 3922348dcbe3280dd031e5cbfd7ea3c465b70398)
• 

  Guus der Kinderen 28 Aug 2020 62a0715905cf17129c30efd5028b6a20b3b25b82

  OF-2070: Tests in FlattenNestedGroupsTest regularly fail - disable
  Disable this test until a fix can be found.

  • xmppserver/src/test/java/org/jivesoftware/openfire/ldap/FlattenNestedGroupsTest.java (version 62a0715905cf17129c30efd5028b6a20b3b25b82)
• 

  Guus der Kinderen 28 Aug 2020 bb858323878b96f36491768d70fb2775ae96f33e

  OF-2060: (re)populate clustered caches when switching implementation
  This commit is a follow-up to reverting the changes for OF-974
  
  When a server joins or leaves a cluster, the implementation that's behind the Cache interface is swapped. When switching _to_ a clustered implementation (_from_ a local/non-clustered implementation), the replacement cache can be used to interact with the cache content that's shared in the cluster. When switching _from_ a clustered implementation (_to_ a local/non-clustered implementation) the cache is replaced with a new (empty) default cache.
  
  OF-974 (now reverted) introduced a change that caused the content from the old implementation to be copied to the new one during the switch-over. This prevented data to be 'lost'. This approach has a considerable drawbacks: When data exists in both caches under the same key, one of the entries will be lost. Depending on the usage of a cache, different techniques to merge data can be desirable. The solution for OF-974 does not allow for that. Also, OF-974 assumes that it is desirable to retain data from the cluster after the node leaves the cluster. This is questionable. In cases, usage-specific code is needed to 'clean up' caches. This leads to a fragmentation of the responsibility of maintaining the cache content over various places: the utilizing code of the cache, as well as the CacheFactory. This adds code complexity.
  
  The original stategy (which has been restored by reverting OF-974) was for code to anticipate that, during cluster join and leave action, the data from the local node was missing from the cache. This introduced the various 'restoreCacheContent' method implementations. This has it's own challenges: there's the problem of 'missing data' (which lead to OF-974 in the first place), but also of not having access to the state of the cache prior to the change makes it hard to detect what changes are applied, which in turn makes it difficult to invoke corresponding event listeners, etc). It does, however, allow for far more granual control over the cache content, on a per-usage base. Additionally, cache content control can more easily be implemented in one central place, reducing complexity of the solution.
  
  This commit restores the original strategy, mainly by restoring notion of 'caches will not contain local data directly after a switchover' and re-introducing various 'restoreCacheContent' implementations, in places that currently inherit from ClusterEventListener.

  • xmppserver/src/main/java/org/jivesoftware/openfire/SessionManager.java (version bb858323878b96f36491768d70fb2775ae96f33e)
  • xmppserver/src/main/java/org/jivesoftware/openfire/component/InternalComponentManager.java (version bb858323878b96f36491768d70fb2775ae96f33e)
  • xmppserver/src/main/java/org/jivesoftware/openfire/disco/IQDiscoInfoHandler.java (version bb858323878b96f36491768d70fb2775ae96f33e)
  • xmppserver/src/main/java/org/jivesoftware/openfire/disco/IQDiscoItemsHandler.java (version bb858323878b96f36491768d70fb2775ae96f33e)
  • xmppserver/src/main/java/org/jivesoftware/openfire/handler/PresenceUpdateHandler.java (version bb858323878b96f36491768d70fb2775ae96f33e)
  • xmppserver/src/main/java/org/jivesoftware/openfire/muc/MultiUserChatManager.java (version bb858323878b96f36491768d70fb2775ae96f33e)
  • xmppserver/src/main/java/org/jivesoftware/openfire/session/ClientSessionInfo.java (version bb858323878b96f36491768d70fb2775ae96f33e)
  • xmppserver/src/main/java/org/jivesoftware/openfire/spi/RoutingTableImpl.java (version bb858323878b96f36491768d70fb2775ae96f33e)
• 

  Guus der Kinderen 28 Aug 2020 7cd8ad9eaa38fd393b470852147e740eee113d01

  OF-2060: Add references to issues in 'TODO' comments for OF-2066 and OF-2067

  • xmppserver/src/main/java/org/jivesoftware/openfire/spi/RoutingTableImpl.java (version 7cd8ad9eaa38fd393b470852147e740eee113d01)
• 

  Guus der Kinderen 28 Aug 2020 3885970b7666de11f21a0f9f359e4ea372664b3e

  OF-2060: Add javadoc explaining cache behavior in cluster

  • xmppserver/src/main/java/org/jivesoftware/util/cache/Cache.java (version 3885970b7666de11f21a0f9f359e4ea372664b3e)
• 

  Guus der Kinderen 28 Aug 2020 c366559937f952f6316779c99e17d026f9dfa353

  Revert "OF-974: Migrate cache content"
  This reverts commit 18af4f0b6eea590ba356b88cd1e73823fd49b864.

  • xmppserver/src/main/java/org/jivesoftware/util/cache/CacheFactory.java (version c366559937f952f6316779c99e17d026f9dfa353)
• 

  Guus der Kinderen 28 Aug 2020 75e410c8849e1d36ffeee788b075eaf489300d91

  OF-2060: Additional documentation and TODOs around cluster-related events.

  • xmppserver/src/main/java/org/jivesoftware/openfire/SessionManager.java (version 75e410c8849e1d36ffeee788b075eaf489300d91)
  • xmppserver/src/main/java/org/jivesoftware/openfire/cluster/ClusterEventListener.java (version 75e410c8849e1d36ffeee788b075eaf489300d91)
  • xmppserver/src/main/java/org/jivesoftware/openfire/disco/IQDiscoInfoHandler.java (version 75e410c8849e1d36ffeee788b075eaf489300d91)
  • xmppserver/src/main/java/org/jivesoftware/openfire/disco/IQDiscoItemsHandler.java (version 75e410c8849e1d36ffeee788b075eaf489300d91)
  • xmppserver/src/main/java/org/jivesoftware/openfire/handler/PresenceUpdateHandler.java (version 75e410c8849e1d36ffeee788b075eaf489300d91)
  • xmppserver/src/main/java/org/jivesoftware/openfire/spi/RoutingTableImpl.java (version 75e410c8849e1d36ffeee788b075eaf489300d91)
• 

  Guus der Kinderen 28 Aug 2020 ab5d959dd3811fc849217f6bdefcadb08412b756

  OF-2065: Entries of the 'Components' cache should not expire
  There's no way in code that content can be retrieved after it has been expired (other than the component reconnecting). The javadoc also states that entries shouldn't expire. This commit adds explicit configuration that ensures this behavior (the default configuration _does_ configure the cache to eventually expire).

  • xmppserver/src/main/java/org/jivesoftware/util/cache/CacheFactory.java (version ab5d959dd3811fc849217f6bdefcadb08412b756)
• 

  Guus der Kinderen 28 Aug 2020 15c46581ef544a3a671adeb2d34fbcc785872f8b

  OF-2069: Merge pull request #1694 from nsobadzhiev/null-pointer-token-domain-sm
  Null pointer for domain in StreamManagement when resuming
• 

  Nikola <nikola@feinfone.com> 27 Aug 2020 77090ec6abc2ea2226be34c0e7cdb44742e41e40

  Fixed null pointer when resuming a session and xmpp.domain is null

  • xmppserver/src/main/java/org/jivesoftware/openfire/streammanagement/StreamManager.java (version 77090ec6abc2ea2226be34c0e7cdb44742e41e40)