qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gmur...@apache.org
Subject qpid-dispatch git commit: DISPATCH-633 - Return int status codes from both c agent and python agent
Date Thu, 16 Feb 2017 20:16:05 GMT
Repository: qpid-dispatch
Updated Branches:
  refs/heads/master 3c8f95c8d -> 1c6d489a2


DISPATCH-633 - Return int status codes from both c agent and python agent

(cherry picked from commit 17863810172becb14030a194235ca532c7324473)


Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/1c6d489a
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/1c6d489a
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/1c6d489a

Branch: refs/heads/master
Commit: 1c6d489a2f9a936e3c32b9da88ee214a28ddedcb
Parents: 3c8f95c
Author: Ganesh Murthy <gmurthy@redhat.com>
Authored: Thu Feb 16 15:04:02 2017 -0500
Committer: Ganesh Murthy <gmurthy@redhat.com>
Committed: Thu Feb 16 15:11:39 2017 -0500

----------------------------------------------------------------------
 src/python_embedded.c              | 3 ++-
 src/router_core/management_agent.c | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/1c6d489a/src/python_embedded.c
----------------------------------------------------------------------
diff --git a/src/python_embedded.c b/src/python_embedded.c
index 0c8f236..27374c2 100644
--- a/src/python_embedded.c
+++ b/src/python_embedded.c
@@ -138,7 +138,8 @@ qd_error_t qd_py_to_composed(PyObject *value, qd_composed_field_t *field)
         qd_compose_insert_bool(field, PyInt_AS_LONG(value) ? 1 : 0);
     }
     else if (PyInt_Check(value)) {
-        qd_compose_insert_long(field, (int64_t) PyInt_AS_LONG(value));
+        // We are now sure that the value is an int
+        qd_compose_insert_int(field, (int32_t) PyInt_AS_LONG(value));
     }
     else if (PyLong_Check(value)) {
         qd_compose_insert_long(field, (int64_t) PyLong_AsLongLong(value));

http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/1c6d489a/src/router_core/management_agent.c
----------------------------------------------------------------------
diff --git a/src/router_core/management_agent.c b/src/router_core/management_agent.c
index 52da6a2..0113baa 100644
--- a/src/router_core/management_agent.c
+++ b/src/router_core/management_agent.c
@@ -125,7 +125,7 @@ static void qd_set_response_status(const qd_amqp_error_t *error, qd_composed_fie
     qd_compose_insert_string(*field, status_description);
     qd_compose_insert_string(*field, error->description);
     qd_compose_insert_string(*field, status_code);
-    qd_compose_insert_uint(*field, error->status);
+    qd_compose_insert_int(*field, error->status);
     qd_compose_end_map(*field);
 }
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message