From 1467937c1ac3aafc69233b9411e9024e609bcfa2 Mon Sep 17 00:00:00 2001
From: nkurihar <nkurihar6012@gmail.com>
Date: Sat, 2 Mar 2019 09:53:34 +0900
Subject: [PATCH] fix pulsar_message_set_replication_clusters (#3729)

---
 pulsar-client-cpp/include/pulsar/c/message.h | 4 ++--
 pulsar-client-cpp/lib/c/c_Message.cc         | 8 ++++----
 pulsar-client-go/pulsar/c_message.go         | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pulsar-client-cpp/include/pulsar/c/message.h b/pulsar-client-cpp/include/pulsar/c/message.h
index 3955a6d3cf2..36034852627 100644
--- a/pulsar-client-cpp/include/pulsar/c/message.h
+++ b/pulsar-client-cpp/include/pulsar/c/message.h
@@ -87,7 +87,7 @@ void pulsar_message_set_sequence_id(pulsar_message_t *message, int64_t sequenceI
  *
  * @param clusters where to send this message.
  */
-void pulsar_message_set_replication_clusters(pulsar_message_t *message, const char **clusters);
+void pulsar_message_set_replication_clusters(pulsar_message_t *message, const char **clusters, size_t size);
 
 /**
  * Do not replicate this message
@@ -173,4 +173,4 @@ const char *pulsar_message_get_topic_name(pulsar_message_t *message);
 
 #ifdef __cplusplus
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/pulsar-client-cpp/lib/c/c_Message.cc b/pulsar-client-cpp/lib/c/c_Message.cc
index 34740d3aeb2..3047fa0aef2 100644
--- a/pulsar-client-cpp/lib/c/c_Message.cc
+++ b/pulsar-client-cpp/lib/c/c_Message.cc
@@ -48,11 +48,11 @@ void pulsar_message_set_sequence_id(pulsar_message_t *message, int64_t sequenceI
     message->builder.setSequenceId(sequenceId);
 }
 
-void pulsar_message_set_replication_clusters(pulsar_message_t *message, const char **clusters) {
-    const char *c = clusters[0];
+void pulsar_message_set_replication_clusters(pulsar_message_t *message, const char **clusters, size_t size) {
+    const char **c = clusters;
     std::vector<std::string> clustersList;
-    while (c) {
-        clustersList.push_back(c);
+    for (size_t i = 0; i < size; i++) {
+        clustersList.push_back(*c);
         ++c;
     }
 
diff --git a/pulsar-client-go/pulsar/c_message.go b/pulsar-client-go/pulsar/c_message.go
index 0a451276410..c8820390a6a 100644
--- a/pulsar-client-go/pulsar/c_message.go
+++ b/pulsar-client-go/pulsar/c_message.go
@@ -88,7 +88,7 @@ func buildMessage(message ProducerMessage) *C.pulsar_message_t {
 				C.setString(array, C.CString(s), C.int(i))
 			}
 
-			C.pulsar_message_set_replication_clusters(cMsg, array)
+			C.pulsar_message_set_replication_clusters(cMsg, array, size)
 		}
 	}
 
-- 
GitLab