Return-Path: X-Original-To: apmail-activemq-commits-archive@www.apache.org Delivered-To: apmail-activemq-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 E141A70BD for ; Mon, 28 Nov 2011 00:12:08 +0000 (UTC) Received: (qmail 29522 invoked by uid 500); 28 Nov 2011 00:12:08 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 29463 invoked by uid 500); 28 Nov 2011 00:12:08 -0000 Mailing-List: contact commits-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 commits@activemq.apache.org Received: (qmail 29456 invoked by uid 99); 28 Nov 2011 00:12:08 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 28 Nov 2011 00:12:08 +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; Mon, 28 Nov 2011 00:12:07 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id E35832388993 for ; Mon, 28 Nov 2011 00:11:46 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1206933 - /activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/OpenwireProtocolHandler.scala Date: Mon, 28 Nov 2011 00:11:46 -0000 To: commits@activemq.apache.org From: chirino@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111128001146.E35832388993@eris.apache.org> Author: chirino Date: Mon Nov 28 00:11:37 2011 New Revision: 1206933 URL: http://svn.apache.org/viewvc?rev=1206933&view=rev Log: Stub out the XA bits in open wire. Modified: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/OpenwireProtocolHandler.scala Modified: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/OpenwireProtocolHandler.scala URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/OpenwireProtocolHandler.scala?rev=1206933&r1=1206932&r2=1206933&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/OpenwireProtocolHandler.scala (original) +++ activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/OpenwireProtocolHandler.scala Mon Nov 28 00:11:37 2011 @@ -536,16 +536,35 @@ class OpenwireProtocolHandler extends Pr get_tx_ctx(id).rollback ack(info) + case TransactionInfo.FORGET => + //die("XA not yet supported") + // get_tx_ctx(id).forget + ack(info) + case TransactionInfo.END => - die("XA not yet supported") + //die("XA not yet supported") + // get_tx_ctx(id).end + ack(info) + case TransactionInfo.PREPARE => - die("XA not yet supported") + // die("XA not yet supported") + // get_tx_ctx(id).prepare + ack(info) + case TransactionInfo.COMMIT_TWO_PHASE => - die("XA not yet supported") + // die("XA not yet supported") + get_tx_ctx(id).commit { + ack(info) + } + case TransactionInfo.RECOVER => - die("XA not yet supported") - case TransactionInfo.FORGET => - die("XA not yet supported") + // die("XA not yet supported") + val receipt = new DataArrayResponse + var data = Array[XATransactionId]() + receipt.setData(data) + receipt.setCorrelationId(info.getCommandId) + connection_session.offer(receipt); + case _ => fail("Transaction info type unknown: " + info.getType)