incorporate recent development changes (af4814e1)

Author: Petr Matousek

src/api/qpid-proton/reactor/handler/TxReceiverHandler.cpp

@@ -134,7 +134,7 @@ int TxReceiverHandler::getBatchSize() const
 
 void TxReceiverHandler::on_session_open(session &s) {
     logger(trace) << "[on_session_open] declare_txn started...";
-    s.declare_transaction(*this);
+    s.transaction_declare(*this);
     logger(trace) << "[on_session_open] declare_txn ended...";
     logger(debug) << "[on_session_open] transaction batch size: " << batch_size;
 }
@@ -155,16 +155,15 @@ void TxReceiverHandler::on_transaction_declared(session s) {
     } else if (count != 0) {
         batch_size = count;
     }
-    logger(trace) << "[on_transaction_declared] txn called " << (&s);
-    logger(debug) << "[on_transaction_declared] txn is_empty " << (s.transaction_is_empty());
+    logger(trace) << "[on_transaction_declared] txn called " << s.transaction_id();
 }
 
 void TxReceiverHandler::on_transaction_aborted(session s) {
     processed += current_batch;
     current_batch = 0;
     logger(debug) << "[on_transaction_aborted] messages aborted, processed: " << processed;
     if (count == 0 || processed < count) {
-        s.declare_transaction(*this);
+        s.transaction_declare(*this);
     } else {
         logger(info) << "[on_transaction_aborted] All messages processed";
         s.connection().close();
@@ -176,7 +175,7 @@ void TxReceiverHandler::on_transaction_committed(session s) {
     current_batch = 0;
     logger(debug) << "[on_transaction_committed] messages committed, processed: " << processed;
     if (count == 0 || processed < count) {
-        s.declare_transaction(*this);
+        s.transaction_declare(*this);
     } else {
         logger(info) << "[on_transaction_committed] All messages processed";
         s.connection().close();
@@ -371,7 +370,7 @@ void TxReceiverHandler::on_message(delivery &d, message &m)
     // TODO legit?
     session s = d.session();
 
-    s.transaction_accept(d);
+    d.accept();
     current_batch += 1;
 
     logger(debug) << "[on_message] current batch: " << current_batch;
@@ -451,7 +450,7 @@ void TxReceiverHandler::on_message(delivery &d, message &m)
            } else {
                processed += current_batch;
                current_batch = 0;
-               s.declare_transaction(*this);
+               s.transaction_declare(*this);
            }
         }
 

src/api/qpid-proton/reactor/handler/TxSenderHandler.cpp

@@ -152,7 +152,6 @@ void TxSenderHandler::send(session s)
     }
 
 
-    logger(trace) << "[send] Transaction is empty: " << s.transaction_is_empty();
     logger(debug) << "[send] Messages processed: " << processed;
     logger(trace) << "[send] Current batch: " << current_batch;
     while (s.transaction_is_declared() && sndr.credit() && (processed + current_batch) < count)
@@ -198,7 +197,7 @@ void TxSenderHandler::send(session s)
                } else {
                    processed += current_batch;
                    current_batch = 0;
-                   s.declare_transaction(*this);
+                   s.transaction_declare(*this);
                }
             }
         } else if (processed + current_batch == count) {
@@ -240,9 +239,7 @@ void TxSenderHandler::on_connection_close(connection &c)
 }
 
 void TxSenderHandler::on_transaction_declared(session s) {
-    logger(trace) << "[on_transaction_declared] txn called " << (&s);
-    logger(trace) << "[on_transaction_declared] txn is_empty " << (s.transaction_is_empty())
-                  << "\t" << s.transaction_is_empty();
+    logger(trace) << "[on_transaction_declared] txn called " << s.transaction_id();
     send(s);
 }
 
@@ -256,7 +253,7 @@ void TxSenderHandler::on_transaction_committed(session s) {
     } else {
         logger(trace) << "[on_transaction_committed] Declaring new transaction";
         current_batch = 0;
-        s.declare_transaction(*this);
+        s.transaction_declare(*this);
     }
 }
 
@@ -270,7 +267,7 @@ void TxSenderHandler::on_transaction_aborted(session s) {
     } else {
         logger(trace) << "[on_transaction_aborted] Declaring new transaction";
         current_batch = 0;
-        s.declare_transaction(*this);
+        s.transaction_declare(*this);
     }
 }
 
@@ -280,7 +277,7 @@ void TxSenderHandler::on_sender_close(sender &s) {
 
 void TxSenderHandler::on_session_open(session &s) {
      logger(trace) << "[on_session_open] declare_txn started...";
-     s.declare_transaction(*this);
+     s.transaction_declare(*this);
      logger(trace) << "[on_session_open] declare_txn ended...";
 }