Build #2,268

Plan branch:
Verifies the integrety of the projects, as builds are executed immediately after a code change was detected. This plan provides no artifiacts (use a nightly build instead).

Build: #2268 was successful Changes by Guus der Kinderen

Code commits

Openfire (master)

  • Guus der Kinderen

    Guus der Kinderen 0eded0ebf84ec395516011fc35d35509905f6de5

    OF-2412: Handle secure XML property migration synchronously
    When Openfire starts, all XML properties are migrated to the database. This currently is performed in an asynchronous process. This seems to open the door for a race condition. As the amount of properties involved is unlikely to be very high, switching to a synchronous process seems to offer more predictability.

    • xmppserver/src/main/java/org/jivesoftware/util/JiveGlobals.java (version 0eded0ebf84ec395516011fc35d35509905f6de5)
  • Guus der Kinderen

    Guus der Kinderen 5f30df15cf6ac47b87aba7bba6c960d3ef143836

    OF-2411: Prevent deadlock in XmlProperties
    OF-2377 introduced an updated implementation of the thread-safety module of XmlProperties (the old one wasn't fully thread-safe).

    This new implementation causes a very specific problem at startup: When the initial attempt to migrate an XmlProperty is undertaken, TaskEngine is instantiated, which in turn tries to read/write properties (while under lock). This causes a deadlock.

    To work around this issue, this commit replaces the usage of TaskEngine with a throw-away thread (that does not use any properties).

    • xmppserver/src/main/java/org/jivesoftware/util/JiveGlobals.java (version 5f30df15cf6ac47b87aba7bba6c960d3ef143836)