Return-Path: X-Original-To: apmail-qpid-commits-archive@www.apache.org Delivered-To: apmail-qpid-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 65F199B39 for ; Thu, 8 Dec 2011 16:30:20 +0000 (UTC) Received: (qmail 16778 invoked by uid 500); 8 Dec 2011 16:30:20 -0000 Delivered-To: apmail-qpid-commits-archive@qpid.apache.org Received: (qmail 16763 invoked by uid 500); 8 Dec 2011 16:30:20 -0000 Mailing-List: contact commits-help@qpid.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@qpid.apache.org Delivered-To: mailing list commits@qpid.apache.org Received: (qmail 16756 invoked by uid 99); 8 Dec 2011 16:30:20 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Dec 2011 16:30:20 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Thu, 08 Dec 2011 16:30:17 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 151B32388A39 for ; Thu, 8 Dec 2011 16:29:56 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1211959 - /qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/XASessionImpl.java Date: Thu, 08 Dec 2011 16:29:56 -0000 To: commits@qpid.apache.org From: rajith@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111208162956.151B32388A39@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rajith Date: Thu Dec 8 16:29:55 2011 New Revision: 1211959 URL: http://svn.apache.org/viewvc?rev=1211959&view=rev Log: QPID-3625 Commiting the patch by Weston Price. (cherry picked from commit fe3d0c1184bb124973e2cd7e451a67ac4a52a692) Modified: qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/XASessionImpl.java Modified: qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/XASessionImpl.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/XASessionImpl.java?rev=1211959&r1=1211958&r2=1211959&view=diff ============================================================================== --- qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/XASessionImpl.java (original) +++ qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/XASessionImpl.java Thu Dec 8 16:29:55 2011 @@ -5,9 +5,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -51,7 +51,7 @@ public class XASessionImpl extends AMQSe int defaultPrefetchHigh, int defaultPrefetchLow) { super(qpidConnection, con, channelId, false, // this is not a transacted session - Session.AUTO_ACKNOWLEDGE, // the ack mode is transacted + Session.CLIENT_ACKNOWLEDGE, //QPID-3625 XA should explicitly ack messages MessageFactoryRegistry.newDefaultRegistry(), defaultPrefetchHigh, defaultPrefetchLow,null); createSession(); _xaResource = new XAResourceImpl(this); --------------------------------------------------------------------- Apache Qpid - AMQP Messaging Implementation Project: http://qpid.apache.org Use/Interact: mailto:commits-subscribe@qpid.apache.org