Build: #1023 was successful Manual run by Guus der Kinderen

Code commits

Openfire (master)

  • Guus der Kinderen

    Guus der Kinderen 834544344819f37d2bc38190cfb98b9c1b934350

    OF-2289: Do not use Interner<String>
    com.google.common.collect.Interner is not safe when used with Strings: as with String.intern(), an equal string value could end up being used as a mutex for unrelated code blocks (introducing the risk of deadlocks between code blocks that have no functional relation).

    When an Interner instance is used with anohter immutable type, the generated mutexes are local to the Interner instance. This allows, for example, for the same JID value to be used with two different Interner instances, without the resulting mutexes influencing each-other.

    This commit replaces all occurrances of Interner<String>.

    • xmppserver/src/main/java/org/jivesoftware/openfire/group/GroupManager.java (version 834544344819f37d2bc38190cfb98b9c1b934350)
    • xmppserver/src/main/java/org/jivesoftware/openfire/lockout/LockOutManager.java (version 834544344819f37d2bc38190cfb98b9c1b934350)
    • xmppserver/src/main/java/org/jivesoftware/openfire/server/OutgoingSessionPromise.java (version 834544344819f37d2bc38190cfb98b9c1b934350)
    • xmppserver/src/main/java/org/jivesoftware/openfire/user/UserManager.java (version 834544344819f37d2bc38190cfb98b9c1b934350)
    • xmppserver/src/main/java/org/jivesoftware/openfire/vcard/DefaultVCardProvider.java (version 834544344819f37d2bc38190cfb98b9c1b934350)
    • xmppserver/src/test/java/org/jivesoftware/Fixtures.java (version 834544344819f37d2bc38190cfb98b9c1b934350)
    • xmppserver/src/test/java/org/jivesoftware/openfire/user/UserManagerTest.java (version 834544344819f37d2bc38190cfb98b9c1b934350)
  • Guus der Kinderen

    Guus der Kinderen c6a54b6cb5379c7815757a8013608a6eccd803a5

    OF-2316: Make fast-discard timeout configurable

    • i18n/src/main/resources/openfire_i18n.properties (version c6a54b6cb5379c7815757a8013608a6eccd803a5)
    • i18n/src/main/resources/openfire_i18n_nl.properties (version c6a54b6cb5379c7815757a8013608a6eccd803a5)
    • xmppserver/src/main/java/org/jivesoftware/openfire/server/OutgoingSessionPromise.java (version c6a54b6cb5379c7815757a8013608a6eccd803a5)
  • Guus der Kinderen

    Guus der Kinderen 7c08a12d9544b35933a3a9b4a403a602f8caf018

    OF-2315: Don't attempt to reply to IQ responses
    An IQ 'result' or 'error' stanza cannot be responded to. Attempting to do so might cause endless loops of responses to responses, if the code would not have nullpointered out because of a lack of child element to respond to.

    • xmppserver/src/main/java/org/jivesoftware/openfire/server/OutgoingSessionPromise.java (version 7c08a12d9544b35933a3a9b4a403a602f8caf018)
  • Guus der Kinderen

    Guus der Kinderen 7872f54fa4b1c8c56b4af1ed03f1521f41108f1e

    OF-2315: First log, then process
    By first logging the error condition, the log file will contain a cause for the problem if processing the problem generates a (new) stacktrace (which hides the original one).

    • xmppserver/src/main/java/org/jivesoftware/openfire/server/OutgoingSessionPromise.java (version 7872f54fa4b1c8c56b4af1ed03f1521f41108f1e)
  • Emiel van der Herberg <emiel.van.der.herberg@marviq.com>

    Emiel van der Herberg <emiel.van.der.herberg@marviq.com> f62f8f6f9e674b387f1a689582f0d529ebccd72b

    OF-2314 Kill s2s local connection if it already exists elsewhere in the cluster we are joining.

    • xmppserver/src/main/java/org/jivesoftware/openfire/spi/RoutingTableImpl.java (version f62f8f6f9e674b387f1a689582f0d529ebccd72b)
  • Emiel van der Herberg <emiel.van.der.herberg@marviq.com>

    Emiel van der Herberg <emiel.van.der.herberg@marviq.com> b5ad6278231ebf268199d5df035b212b88c3c20a

    OF-2314 Prevent problem in one s2s connection close from blocking others.

    • xmppserver/src/main/java/org/jivesoftware/openfire/spi/RoutingTableImpl.java (version b5ad6278231ebf268199d5df035b212b88c3c20a)
  • Guus der Kinderen

    Guus der Kinderen dd81fb6dc6586ff97d0e97a67ad78187e1a3a6a5

    OF-2317: Prevent NPE when opening admin console page without session
    Functionally, this shouldn't change anything, other than preventing a stacktrace to be logged on debug level.

    • xmppserver/src/main/java/org/jivesoftware/util/WebManager.java (version dd81fb6dc6586ff97d0e97a67ad78187e1a3a6a5)
  • Guus der Kinderen

    Guus der Kinderen 3f35598461f83941125406d08f686de7e56d08b5

    Reflect aioxmpp project change: replace nose with pytest

    • runAioxmppIntegrationTests (version 3f35598461f83941125406d08f686de7e56d08b5)