You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2011/11/28 01:11:46 UTC

svn commit: r1206933 - /activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/OpenwireProtocolHandler.scala

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)