Return-Path: Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: (qmail 26051 invoked from network); 26 May 2006 02:32:27 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 26 May 2006 02:32:27 -0000 Received: (qmail 30534 invoked by uid 500); 26 May 2006 02:32:26 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 30493 invoked by uid 500); 26 May 2006 02:32:26 -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 30484 invoked by uid 99); 26 May 2006 02:32:26 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 25 May 2006 19:32:26 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 25 May 2006 19:32:25 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 397991A9842; Thu, 25 May 2006 19:32:05 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r409542 - /jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/XASessionImpl.java Date: Fri, 26 May 2006 02:32:04 -0000 To: commits@jackrabbit.apache.org From: jukka@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060526023205.397991A9842@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: jukka Date: Thu May 25 19:32:04 2006 New Revision: 409542 URL: http://svn.apache.org/viewvc?rev=409542&view=rev Log: 1.0: Merged revision 394937: JCR-395 Modified: jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/XASessionImpl.java Modified: jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/XASessionImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/XASessionImpl.java?rev=409542&r1=409541&r2=409542&view=diff ============================================================================== --- jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/XASessionImpl.java (original) +++ jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/XASessionImpl.java Thu May 25 19:32:04 2006 @@ -37,6 +37,7 @@ import javax.transaction.xa.Xid; import java.util.HashMap; import java.util.Map; +import java.util.Collections; /** * Session extension that provides XA support. @@ -52,7 +53,7 @@ /** * Global transactions */ - private static final Map txGlobal = new HashMap(); + private static final Map txGlobal = Collections.synchronizedMap(new HashMap()); /** * Default transaction timeout, in seconds. @@ -321,6 +322,8 @@ tx.prepare(); } tx.commit(); + + txGlobal.remove(xid); } /** @@ -332,6 +335,8 @@ throw new XAException(XAException.XAER_NOTA); } tx.rollback(); + + txGlobal.remove(xid); } /**