Rebase and fix error 'no data'

Author: DreamPearl

cpp/src/session.cpp

@@ -309,26 +309,21 @@ void transaction_impl::release_pending() {
 
 void transaction_impl::handle_outcome(proton::tracker t) {
     pn_disposition_t *disposition = pn_delivery_remote(unwrap(t));
+    pn_declared_disposition_t *declared_disp = pn_declared_disposition(disposition);
     proton::session session = t.session();
     if (state == State::DECLARING) {
         // Attempting to declare transaction
-        proton::value val(pn_disposition_data(disposition));
-        auto vd = get<std::vector<proton::binary>>(val);
-        if (vd.size() > 0) {
-            transaction_id = vd[0];
-            state = State::DECLARED;
-            handler->on_session_open(session);
-            return;
-        } else if (pn_disposition_is_failed(disposition)) {
+        if (pn_disposition_is_failed(disposition)) {
             state = State::FREE;
             transaction_delete(session);
             // on_transaction_declare_failed
             handler->on_session_error(session);
             return;
         } else {
-            state = State::FREE;
-            transaction_delete(session);
-            handler->on_session_error(session);
+            pn_bytes_t txn_id = pn_declared_disposition_get_id(declared_disp);
+            transaction_id = proton::bin(txn_id);
+            state = State::DECLARED;
+            handler->on_session_open(session);
             return;
         }
     } else if (state == State::DISCHARGING) {

cpp/src/transaction_test.cpp

@@ -136,15 +136,12 @@ class FakeBroker : public proton::messaging_handler {
        }
 
        if (descriptor == "amqp:declare:list") {
+           pn_bytes_t txn_id = pn_bytes(fake_txn_id.size(), reinterpret_cast<const char*>(&fake_txn_id[0]));
+
            pn_delivery_t* pd = proton::unwrap(d);
            pn_disposition_t* disp = pn_delivery_local(pd);
-           pn_custom_disposition_t *custom_disp = pn_custom_disposition(disp);
-           pn_custom_disposition_set_type(custom_disp, 0x33);
-           pn_data_t* pn_data = pn_custom_disposition_data(custom_disp);
-           pn_data_put_list(pn_data);
-           pn_data_enter(pn_data);
-           pn_data_put_binary(pn_data, pn_bytes(fake_txn_id.size(), reinterpret_cast<const char*>(&fake_txn_id[0])));
-           pn_data_exit(pn_data);
+           pn_declared_disposition_t* declared_disp = pn_declared_disposition(disp);
+           pn_declared_disposition_set_id(declared_disp, txn_id);
            pn_delivery_settle(pd);
 
            std::cout << "[BROKER] transaction declared: " << fake_txn_id << std::endl;
@@ -304,7 +301,6 @@ int main(int argc, char** argv) {
    std::thread client_thread([&client_container]() -> void { client_container.run(); });
 
    RUN_ARGV_TEST(tests_failed, test_transaction_commit(broker, client));
-   // RUN_ARGV_TEST(tests_failed, test_transaction_abort(broker, client));
 
    broker_thread.join();
    client_thread.join();