Index: jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/XAVersionManager.java =================================================================== --- jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/XAVersionManager.java (Revision 749266) +++ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/XAVersionManager.java (Arbeitskopie) @@ -515,8 +515,7 @@ /** * Returns an {@link InternalXAResource} that acquires a write lock on the - * version manager in {@link InternalXAResource#prepare(TransactionContext)} - * if there are any version related items involved in this transaction. + * version manager in {@link InternalXAResource#prepare(TransactionContext)}. * * @return an internal XA resource. */ @@ -529,11 +528,8 @@ } public void prepare(TransactionContext tx) { - Map vItems = (Map) tx.getAttribute(ITEMS_ATTRIBUTE_NAME); - if (!vItems.isEmpty()) { - vMgr.acquireWriteLock(); - vmgrLocked = true; - } + vMgr.acquireWriteLock(); + vmgrLocked = true; } public void commit(TransactionContext tx) {