You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@celix.apache.org by pn...@apache.org on 2021/05/27 17:53:35 UTC
[celix] branch feature/use_ser_hander_in_psa updated: Fixes wrong
argument check and improves warning print
This is an automated email from the ASF dual-hosted git repository.
pnoltes pushed a commit to branch feature/use_ser_hander_in_psa
in repository https://gitbox.apache.org/repos/asf/celix.git
The following commit(s) were added to refs/heads/feature/use_ser_hander_in_psa by this push:
new cb58c5d Fixes wrong argument check and improves warning print
cb58c5d is described below
commit cb58c5da6e7403e2c3e445bef830f523b03e4022
Author: Pepijn Noltes <pe...@gmail.com>
AuthorDate: Thu May 27 19:53:19 2021 +0200
Fixes wrong argument check and improves warning print
---
bundles/pubsub/pubsub_admin_tcp/v2/src/pubsub_tcp_topic_receiver.c | 2 +-
bundles/pubsub/pubsub_admin_zmq/v2/src/pubsub_zmq_topic_receiver.c | 2 +-
bundles/pubsub/pubsub_utils/src/pubsub_serializer_handler.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/bundles/pubsub/pubsub_admin_tcp/v2/src/pubsub_tcp_topic_receiver.c b/bundles/pubsub/pubsub_admin_tcp/v2/src/pubsub_tcp_topic_receiver.c
index f602be9..a49ff23 100644
--- a/bundles/pubsub/pubsub_admin_tcp/v2/src/pubsub_tcp_topic_receiver.c
+++ b/bundles/pubsub/pubsub_admin_tcp/v2/src/pubsub_tcp_topic_receiver.c
@@ -513,7 +513,7 @@ processMsgForSubscriberEntry(pubsub_tcp_topic_receiver_t *receiver, psa_tcp_subs
receiver->scope == NULL ? "(null)" : receiver->scope, receiver->topic);
}
} else {
- L_WARN("[PSA_TCP_TR] Cannot deserialize message '%s' using %s, version mismatch. Version received: %i.%i.x, version send: %i.%i.x",
+ L_WARN("[PSA_TCP_TR] Cannot deserialize message '%s' using %s, version mismatch. Version received: %i.%i.x, version local: %i.%i.x",
msgFqn,
pubsub_serializerHandler_getSerializationType(receiver->serializerHandler),
(int)message->header.msgMajorVersion,
diff --git a/bundles/pubsub/pubsub_admin_zmq/v2/src/pubsub_zmq_topic_receiver.c b/bundles/pubsub/pubsub_admin_zmq/v2/src/pubsub_zmq_topic_receiver.c
index 22cbc7e..90e9510 100644
--- a/bundles/pubsub/pubsub_admin_zmq/v2/src/pubsub_zmq_topic_receiver.c
+++ b/bundles/pubsub/pubsub_admin_zmq/v2/src/pubsub_zmq_topic_receiver.c
@@ -483,7 +483,7 @@ static inline void processMsgForSubscriberEntry(pubsub_zmq_topic_receiver_t *rec
L_WARN("[PSA_ZMQ_TR] Cannot deserialize msg type %s for scope/topic %s/%s", msgFqn, receiver->scope == NULL ? "(null)" : receiver->scope, receiver->topic);
}
} else {
- L_WARN("[PSA_ZMQ_TR] Cannot deserialize message '%s' using %s, version mismatch. Version received: %i.%i.x, version send: %i.%i.x",
+ L_WARN("[PSA_ZMQ_TR] Cannot deserialize message '%s' using %s, version mismatch. Version received: %i.%i.x, version local: %i.%i.x",
msgFqn,
pubsub_serializerHandler_getSerializationType(receiver->serializerHandler),
(int)message->header.msgMajorVersion,
diff --git a/bundles/pubsub/pubsub_utils/src/pubsub_serializer_handler.c b/bundles/pubsub/pubsub_utils/src/pubsub_serializer_handler.c
index 7d3d0f3..e339795 100644
--- a/bundles/pubsub/pubsub_utils/src/pubsub_serializer_handler.c
+++ b/bundles/pubsub/pubsub_utils/src/pubsub_serializer_handler.c
@@ -458,7 +458,7 @@ int pubsub_serializerHandler_getMsgInfo(
if (msgFqnOut != NULL) {
*msgFqnOut = entry->msgFqn;
}
- if (msgMinorVersionOut != NULL) {
+ if (msgMajorVersionOut != NULL) {
*msgMajorVersionOut = celix_version_getMajor(entry->msgVersion);
}
if (msgMinorVersionOut != NULL) {