Build: #564 was successful Scheduled with changes by daryl herzmann <akrherz@iastate.edu> and Dele Olajide <dele@4ng.net>

Code commits

Openfire (master)

  • daryl herzmann <akrherz@iastate.edu>

    daryl herzmann <akrherz@iastate.edu> 5017d0a10e1b91812bed74cdb426f730a108155f

    Merge pull request #1629 from igniterealtime/fix-issue-OF-2017
    Update Jetty to 9.4.28.v20200408

  • Dele Olajide <dele@4ng.net>

    Dele Olajide <dele@4ng.net> 2200700b1d08a7b83a2ad91edc32241a0f80d480

    Update Jetty to 9.4.28.v20200408

    • pom.xml (version 2200700b1d08a7b83a2ad91edc32241a0f80d480)
    • xmppserver/src/main/java/org/jivesoftware/openfire/spi/EncryptionArtifactFactory.java (version 2200700b1d08a7b83a2ad91edc32241a0f80d480)
  • daryl herzmann <akrherz@iastate.edu>

    daryl herzmann <akrherz@iastate.edu> e46bca20b638a3c164365e0040662b3568bbc430

    Merge pull request #1626 from guusdk/sm-invalid-connection-fixes
    Various fixes for Stream Management

  • Guus der Kinderen

    Guus der Kinderen 481f555554ab258ebcfc19ed6a6ad5053cd56026 m

    Adding debug logging

    • xmppserver/src/main/java/org/jivesoftware/openfire/SessionManager.java (version 481f555554ab258ebcfc19ed6a6ad5053cd56026)
    • xmppserver/src/main/java/org/jivesoftware/openfire/spi/LocalRoutingTable.java (version 481f555554ab258ebcfc19ed6a6ad5053cd56026)
  • Guus der Kinderen

    Guus der Kinderen cff87d5620cf27266df7821e36dd14b5984a6284 m

    OF-2015: Clean up the donor immediately after session resumption.
    When Stream Management is used to resume an old session, the session that was used to resume the old session should be cleaned up immediately. Before this fix, the session lingers in a state of being 'detached'. Not only is there no reason for it to linger (it can't be resumed), marking it as 'detached' is semantically wrong: this session never reached a state where it makes sense to resume it later. The changes in this commit clean up the donor session immediately after resuption.

    • xmppserver/src/main/java/org/jivesoftware/openfire/session/LocalSession.java (version cff87d5620cf27266df7821e36dd14b5984a6284)
    • xmppserver/src/main/java/org/jivesoftware/openfire/streammanagement/StreamManager.java (version cff87d5620cf27266df7821e36dd14b5984a6284)
  • Guus der Kinderen

    Guus der Kinderen 09d4b9a44a5fe25ee3ae24c55e99a6a91df1517f m

    OF-2014: Update OnConnectionClose callback object when re-initializing connection.
    When a connection gets a new owner (Session), make sure that the old owner that was registered with the callback function gets replaced by the new owner. Without this, the callback will be invoked on the old (non-existing) session. This, among others, prevents Stream Management from working properly after a stream has been resumed for the first time.

    • xmppserver/src/main/java/org/jivesoftware/openfire/net/SocketConnection.java (version 09d4b9a44a5fe25ee3ae24c55e99a6a91df1517f)
    • xmppserver/src/main/java/org/jivesoftware/openfire/net/VirtualConnection.java (version 09d4b9a44a5fe25ee3ae24c55e99a6a91df1517f)
    • xmppserver/src/main/java/org/jivesoftware/openfire/nio/NIOConnection.java (version 09d4b9a44a5fe25ee3ae24c55e99a6a91df1517f)
  • Guus der Kinderen

    Guus der Kinderen 4033eefbdb788fb191efcd20b64f3e97526b0319 m

    OF-2013: Improve detection of 'detached' session state.
    Instead of assuming that a session is detached when it's connection is null (which could also be caused by the connection being closed), verify if the session is currently in the collection of detached sessions.

    • xmppserver/src/main/java/org/jivesoftware/openfire/SessionManager.java (version 4033eefbdb788fb191efcd20b64f3e97526b0319)
    • xmppserver/src/main/java/org/jivesoftware/openfire/session/LocalSession.java (version 4033eefbdb788fb191efcd20b64f3e97526b0319)