Branch: refs/heads/master Home: https://github.com/xwiki/xwiki-platform Commit: 06f5f9760fb0030a9098af726b9699161fcf9e27 https://github.com/xwiki/xwiki-platform/commit/06f5f9760fb0030a9098af726b969... Author: Marius Dumitru Florea <marius@xwiki.com> Date: 2026-08-27 (Thu, 27 Aug 2026) Changed paths: M xwiki-platform-core/xwiki-platform-edit/xwiki-platform-edit-ui/src/main/resources/XWiki/InplaceEditing.xml M xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/doc/XWikiDocument.java M xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/store/XWikiHibernateStore.java M xwiki-platform-core/xwiki-platform-oldcore/src/test/java/com/xpn/xwiki/store/XWikiHibernateStoreTest.java M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/src/main/webjar/wysiwygEditor.js M xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-war/src/main/webapp/resources/uicomponents/lock/lock.js Log Message: ----------- XWIKI-22421: XWikiHibernateBaseStore related error when editing in realtime * Removing a document lock is now idempotent: use an HQL bulk delete instead of deleting the entity, because Hibernate expects the delete statement it generates for an entity to remove exactly one row, and fails the transaction otherwise. * Remove the previous lock before saving a new one, rather than updating it in place, which would fail the same way if that lock was removed concurrently. * Don't load the lock before removing it, since only the document id matters. * Keep a single document lock instance per document translation on the client side, so that a single unlock request is sent when the page is unloaded, and stop listening to the events that trigger the unlock when an instance is replaced. * Send the unlock request for the document translation that was locked, which is not necessarily the current one, because the locale of the edited document can change while editing it. * Reuse the existing document lock instance in the realtime WYSIWYG editor instead of creating a new one every time a collaborator leaves the editing session. * Let the in-place editor delegate the unlock to the document lock, instead of registering its own page unload listener. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> To unsubscribe from these emails, change your notification settings at https://github.com/xwiki/xwiki-platform/settings/notifications