Fix message_id_generator lifetime issue

Signed-off-by: Kai-Uwe Hermann <[email protected]>
EVerest · Jan 17, 2024 · f752501 · f752501
1 parent 9afe405
commit f752501
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/include/ocpp/v201/notify_report_requests_splitter.hpp b/include/ocpp/v201/notify_report_requests_splitter.hpp
@@ -20,15 +20,15 @@ class NotifyReportRequestsSplitter {
     const NotifyReportRequest& original_request;
     // cppcheck-suppress unusedStructMember
     size_t max_size;
-    const std::function<MessageId()>& message_id_generator_callback;
+    const std::function<MessageId()> message_id_generator_callback;
     json request_json_template; // json that is used  as template for request json
     // cppcheck-suppress unusedStructMember
     const size_t json_skeleton_size; // size of the json skeleton for a call json object which includes everything
                                      // except the requests' reportData and the messageId
 
 public:
     NotifyReportRequestsSplitter(const NotifyReportRequest& originalRequest, size_t max_size,
-                                 const std::function<MessageId()>& message_id_generator_callback);
+                                 std::function<MessageId()>&& message_id_generator_callback);
     NotifyReportRequestsSplitter() = delete;
 
     /// \brief Splits the provided NotifyReportRequest into (potentially) several Call payloads

diff --git a/lib/ocpp/v201/notify_report_requests_splitter.cpp b/lib/ocpp/v201/notify_report_requests_splitter.cpp
@@ -88,10 +88,10 @@ json NotifyReportRequestsSplitter::create_next_payload(
 }
 NotifyReportRequestsSplitter::NotifyReportRequestsSplitter(
     const NotifyReportRequest& originalRequest, size_t max_size,
-    const std::function<MessageId()>& message_id_generator_callback) :
+    std::function<MessageId()>&& message_id_generator_callback) :
     original_request(originalRequest),
     max_size(max_size),
-    message_id_generator_callback(message_id_generator_callback),
+    message_id_generator_callback{std::move(message_id_generator_callback)},
     json_skeleton_size(create_request_template_json_and_return_skeleton_size()) {
 }