Changeset 158:92ddca5e455c in finroc_plugins_tcp

Timestamp:

02.06.2017 23:28:29 (7 years ago)

Author:

Max Reichardt <mreichardt@…>

Branch:

17.03

Phase:

public

Message:

Fixes issue related to initialization of shared published register info between primary and express connections

File:

• internal/tConnection.cpp (modified) (3 diffs)

internal/tConnection.cpp

@@ -246 +246 @@
           serialization_info.SetRegisterEntryEncoding(static_cast<uint>(network_transport::runtime_info::tRegisterUIDs::SCHEME_HANDLER), rrlib::serialization::tRegisterEntryEncoding::PUBLISH_REGISTER_ON_CHANGE);
         }
-        connection->SharedConnectionInfo().input_stream_prototype.Reset(unused_initialization_buffer, deserialization_info);
-        connection->SharedConnectionInfo().output_stream_prototype.Reset(unused_initialization_buffer, serialization_info);
-
-        connection->InitFrontBuffer();
 
         if (primary_connection && connection->SharedConnectionInfo().remote_runtime->GetPrimaryConnection() != connection)
@@ -257 +253 @@
           return;
         }
+        else if (primary_connection)
+        {
+          connection->SharedConnectionInfo().input_stream_prototype.Reset(unused_initialization_buffer, deserialization_info);
+          connection->SharedConnectionInfo().output_stream_prototype.Reset(unused_initialization_buffer, serialization_info);
+        }
         else if (express_only_connection)
         {
-          if (!connection->SharedConnectionInfo().remote_runtime->AddConnection(connection, true))
+          if (!connection->SharedConnectionInfo().remote_runtime->AddConnection(connection, false))
           {
             connection->SharedConnectionInfo().remote_runtime = nullptr;
@@ -266 +267 @@
           }
         }
+
+        connection->InitFrontBuffer();
         connection->peer.RunEventLoop();