Return-Path: Delivered-To: apmail-activemq-dev-archive@www.apache.org Received: (qmail 28823 invoked from network); 12 Nov 2010 12:12:36 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 12 Nov 2010 12:12:36 -0000 Received: (qmail 96376 invoked by uid 500); 12 Nov 2010 12:13:07 -0000 Delivered-To: apmail-activemq-dev-archive@activemq.apache.org Received: (qmail 96274 invoked by uid 500); 12 Nov 2010 12:13:07 -0000 Mailing-List: contact dev-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list dev@activemq.apache.org Received: (qmail 96266 invoked by uid 99); 12 Nov 2010 12:13:06 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 12 Nov 2010 12:13:06 +0000 X-ASF-Spam-Status: No, hits=0.0 required=10.0 tests=FREEMAIL_FROM,RCVD_IN_DNSWL_NONE,SPF_PASS,T_TO_NO_BRKTS_FREEMAIL X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: domain of gary.tully@gmail.com designates 209.85.216.43 as permitted sender) Received: from [209.85.216.43] (HELO mail-qw0-f43.google.com) (209.85.216.43) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 12 Nov 2010 12:12:58 +0000 Received: by qwk3 with SMTP id 3so2038849qwk.2 for ; Fri, 12 Nov 2010 04:12:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:received:in-reply-to :references:date:message-id:subject:from:to:content-type :content-transfer-encoding; bh=voj6tfSO6uTS3rFDeLcvHUzRpE2qD1cZZafC0H3ztXE=; b=PAeR57IFCwAabUB2OVCweEuWxVMSjrKscGIEfzdFSpnYs5/N41kEdUkQuYCxnsGRTk w3uaUddbfwEwZYt0kbkxNN3SO4QRlvm0e0wZljLNrc0NUpuPH+C+84Gox2m6cz8uZLJr xVcs+cFMtXECECNC5o11tIcwfwHM79Ig70xlc= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :content-type:content-transfer-encoding; b=lBtNhIjt6tJDZNkcnXURFXneUBBMH5P1n2ZuaDFOfd8Y4JM04HSVhOGHANwlGn70tF ZKB8C7LoOzT8xBFKodo41NdynSvoL1uHTDoq2HQcbSyGwCeBeSz4zrClZvnh8BPPlPKb Mx4GlGx9hbf9pmYhWaE3SmW53n9yfie2NM1s8= MIME-Version: 1.0 Received: by 10.229.233.20 with SMTP id jw20mr1904400qcb.62.1289563956446; Fri, 12 Nov 2010 04:12:36 -0800 (PST) Received: by 10.229.182.133 with HTTP; Fri, 12 Nov 2010 04:12:36 -0800 (PST) In-Reply-To: <20101108181923.D592823888A6@eris.apache.org> References: <20101108181923.D592823888A6@eris.apache.org> Date: Fri, 12 Nov 2010 12:12:36 +0000 Message-ID: Subject: Re: svn commit: r1032658 - /activemq/trunk/activemq-core/src/main/java/org/apache/activemq/TransactionContext.java From: Gary Tully To: dev@activemq.apache.org Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable X-Virus-Checked: Checked by ClamAV on apache.org Hey Bruce, this change breaks a bunch of tests in the ra module. The RA does support XA and has some giggery pokery to manage the sessions. Think this should be reverted. Hudson has the failures; see the ra module: https://hudson.apache.org/hudson/job/ActiveMQ/504/#showFailuresLink On 8 November 2010 18:19, wrote: > Author: bsnyder > Date: Mon Nov =A08 18:19:23 2010 > New Revision: 1032658 > > URL: http://svn.apache.org/viewvc?rev=3D1032658&view=3Drev > Log: > AMQ-3022 - Improve error message when a transaction is attempted to be su= spended/resumed > > Modified: > =A0 =A0activemq/trunk/activemq-core/src/main/java/org/apache/activemq/Tra= nsactionContext.java > > Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/= TransactionContext.java > URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/j= ava/org/apache/activemq/TransactionContext.java?rev=3D1032658&r1=3D1032657&= r2=3D1032658&view=3Ddiff > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/Transa= ctionContext.java (original) > +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/Transa= ctionContext.java Mon Nov =A08 18:19:23 2010 > @@ -334,12 +334,17 @@ public class TransactionContext implemen > =A0 =A0 =A0 =A0 =A0 =A0 throw new XAException(XAException.XAER_PROTO); > =A0 =A0 =A0 =A0 } > > - =A0 =A0 =A0 =A0// if ((flags & TMJOIN) =3D=3D TMJOIN) { > - =A0 =A0 =A0 =A0// // TODO: verify that the server has seen the xid > - =A0 =A0 =A0 =A0// } > - =A0 =A0 =A0 =A0// if ((flags & TMJOIN) =3D=3D TMRESUME) { > - =A0 =A0 =A0 =A0// // TODO: verify that the xid was suspended. > - =A0 =A0 =A0 =A0// } > + =A0 =A0 =A0 =A0String txSuspendResumeNotSupportMsg =3D "The suspend/res= ume of a transaction " > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 + "is not supported. Instead it is recommen= ded that a new JMS session be created."; > + > + =A0 =A0 =A0 =A0if ((flags & TMJOIN) =3D=3D TMJOIN) { > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 throw new XAException(txSuspendResumeNotSup= portMsg); > + =A0 =A0 =A0 =A0// TODO: verify that the server has seen the xid > + =A0 =A0 =A0 =A0} > + =A0 =A0 =A0 =A0if ((flags & TMRESUME) =3D=3D TMRESUME) { > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 throw new XAException(txSuspendResumeNotSup= portMsg); > + =A0 =A0 =A0 =A0// TODO: verify that the xid was suspended. > + =A0 =A0 =A0 =A0} > > =A0 =A0 =A0 =A0 // associate > =A0 =A0 =A0 =A0 synchronizations =3D null; > > > --=20 http://blog.garytully.com http://fusesource.com