celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rlenfer...@apache.org
Subject [2/2] celix git commit: Fix for pubsub multipart zmq
Date Thu, 21 Dec 2017 15:16:29 GMT
Fix for pubsub multipart zmq


Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/462d6797
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/462d6797
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/462d6797

Branch: refs/heads/develop
Commit: 462d6797071b99ad74ff5c88095c5b3ba8fe8e4e
Parents: e840c31
Author: Roy Lenferink <lenferinkroy@gmail.com>
Authored: Thu Dec 21 16:15:16 2017 +0100
Committer: Roy Lenferink <lenferinkroy@gmail.com>
Committed: Thu Dec 21 16:15:16 2017 +0100

----------------------------------------------------------------------
 pubsub/pubsub_admin_zmq/private/src/topic_subscription.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/celix/blob/462d6797/pubsub/pubsub_admin_zmq/private/src/topic_subscription.c
----------------------------------------------------------------------
diff --git a/pubsub/pubsub_admin_zmq/private/src/topic_subscription.c b/pubsub/pubsub_admin_zmq/private/src/topic_subscription.c
index 3c4e2a0..0e7a794 100644
--- a/pubsub/pubsub_admin_zmq/private/src/topic_subscription.c
+++ b/pubsub/pubsub_admin_zmq/private/src/topic_subscription.c
@@ -652,7 +652,7 @@ static int pubsub_getMultipart(void *handle, unsigned int msgTypeId, bool
retain
 	}
 
 	mp_handle_pt mp_handle = (mp_handle_pt)handle;
-	msg_map_entry_pt entry = hashMap_get(mp_handle->rcv_msg_map,&msgTypeId);
+	msg_map_entry_pt entry = hashMap_get(mp_handle->rcv_msg_map, (void*)(uintptr_t) msgTypeId);
 	if(entry!=NULL){
 		entry->retain = retain;
 		*part = entry->msgInst;
@@ -690,7 +690,7 @@ static mp_handle_pt create_mp_handle(hash_map_pt svc_msg_db,array_list_pt
rcv_ms
 			bool validVersion = checkVersion(msgSer->msgVersion,header);
 
 			if(validVersion){
-				celix_status_t status = msgSer->deserialize(msgSer->handle, (const void*)zframe_data(c_msg->payload),
0, &msgInst);
+				celix_status_t status = msgSer->deserialize(msgSer, (const void*)zframe_data(c_msg->payload),
0, &msgInst);
 
 				if(status == CELIX_SUCCESS){
 					msg_map_entry_pt entry = calloc(1,sizeof(struct msg_map_entry));


Mime
View raw message