Return-Path: Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: (qmail 38751 invoked from network); 3 Nov 2008 12:49:17 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 3 Nov 2008 12:49:17 -0000 Received: (qmail 11261 invoked by uid 500); 3 Nov 2008 12:49:23 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 11225 invoked by uid 500); 3 Nov 2008 12:49:23 -0000 Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list commits@jackrabbit.apache.org Received: (qmail 11216 invoked by uid 99); 3 Nov 2008 12:49:22 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Nov 2008 04:49:22 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Nov 2008 12:48:14 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 1EE422388870; Mon, 3 Nov 2008 04:48:56 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r710047 - /jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/XASessionImpl.java Date: Mon, 03 Nov 2008 12:48:55 -0000 To: commits@jackrabbit.apache.org From: jukka@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081103124856.1EE422388870@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jukka Date: Mon Nov 3 04:48:55 2008 New Revision: 710047 URL: http://svn.apache.org/viewvc?rev=710047&view=rev Log: JCR-1775: Transaction-safe versioning Correct ordering of versioning operations in XA transactions. Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/XASessionImpl.java Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/XASessionImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/XASessionImpl.java?rev=710047&r1=710046&r2=710047&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/XASessionImpl.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/XASessionImpl.java Mon Nov 3 04:48:55 2008 @@ -128,7 +128,7 @@ XAVersionManager versionMgr = (XAVersionManager) getVersionManager(); /** - * Create array that contains all resources that paricipate in this + * Create array that contains all resources that participate in this * transactions. Some resources depend on each other, therefore you * should only change the sequence if you know what you are doing! * @@ -137,12 +137,12 @@ * acquires the write lock on the version manager in its prepare method, * while the end resource releases the write lock in either commit or * rollback. Please note that the write lock is only acquired if there - * is someting to commit by the version manager. + * is something to commit by the version manager. * For further information see JCR-335 and JCR-962. */ txResources = new InternalXAResource[] { versionMgr.getXAResourceBegin(), - stateMgr, lockMgr, versionMgr, + versionMgr, stateMgr, lockMgr, versionMgr.getXAResourceEnd() }; stateMgr.setVirtualProvider(versionMgr);