qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acon...@apache.org
Subject [09/50] [abbrv] qpid-proton git commit: PROTON-927: reverse previous change pending investigation into segfault on windows in the added test
Date Tue, 08 Sep 2015 16:37:27 GMT
PROTON-927: reverse previous change pending investigation into segfault on windows in the added
test


Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/23a4e3bb
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/23a4e3bb
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/23a4e3bb

Branch: refs/heads/proton-go
Commit: 23a4e3bbb77e14cff6366d7a87aa804f84baa7f6
Parents: 1497259
Author: Gordon Sim <gsim@redhat.com>
Authored: Mon Jul 6 11:22:28 2015 +0100
Committer: Gordon Sim <gsim@redhat.com>
Committed: Mon Jul 6 11:22:28 2015 +0100

----------------------------------------------------------------------
 proton-c/src/message/message.c       |  4 +---
 tests/python/proton_tests/message.py | 13 -------------
 2 files changed, 1 insertion(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/23a4e3bb/proton-c/src/message/message.c
----------------------------------------------------------------------
diff --git a/proton-c/src/message/message.c b/proton-c/src/message/message.c
index 847c314..b24a994 100644
--- a/proton-c/src/message/message.c
+++ b/proton-c/src/message/message.c
@@ -792,7 +792,7 @@ int pn_message_data(pn_message_t *msg, pn_data_t *data)
     pn_data_exit(data);
   }
 
-  err = pn_data_fill(data, "DL[CzSSSCss?t?tSIS]", PROPERTIES,
+  err = pn_data_fill(data, "DL[CzSSSCssttSIS]", PROPERTIES,
                      msg->id,
                      pn_string_size(msg->user_id), pn_string_get(msg->user_id),
                      pn_string_get(msg->address),
@@ -802,8 +802,6 @@ int pn_message_data(pn_message_t *msg, pn_data_t *data)
                      pn_string_get(msg->content_type),
                      pn_string_get(msg->content_encoding),
                      msg->expiry_time,
-                     msg->expiry_time,
-                     msg->creation_time,
                      msg->creation_time,
                      pn_string_get(msg->group_id),
                      msg->group_sequence,

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/23a4e3bb/tests/python/proton_tests/message.py
----------------------------------------------------------------------
diff --git a/tests/python/proton_tests/message.py b/tests/python/proton_tests/message.py
index 899cbab..2f7cb4f 100644
--- a/tests/python/proton_tests/message.py
+++ b/tests/python/proton_tests/message.py
@@ -129,16 +129,3 @@ class CodecTest(Test):
     assert self.msg.address == msg2.address, (self.msg.address, msg2.address)
     assert self.msg.subject == msg2.subject, (self.msg.subject, msg2.subject)
     assert self.msg.body == msg2.body, (self.msg.body, msg2.body)
-
-  def testRoundTripWithTimes(self):
-    self.msg.expiry_time = 987654321;
-    self.msg.creation_time = 123456789;
-    self.msg.body = 'Hello World!'
-
-    data = self.msg.encode()
-
-    msg2 = Message()
-    msg2.decode(data)
-
-    assert self.msg.expiry_time == msg2.expiry_time, (self.msg.expiry_time, msg2.expiry_time)
-    assert self.msg.creation_time == msg2.creation_time, (self.msg.creation_time, msg2.creation_time)


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


Mime
View raw message