generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-10-26 18:42:43 +01:00
Code Issues Projects Releases Wiki Activity

ZAP vs. ZMTP metadata priority fixed

Browse Source
This commit is contained in:
Pieter Hintjens
2014-05-02 23:14:27 +02:00
parent c01365d486
commit b06474312d
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/stream_engine.cpp
View File

@@ -742,14 +742,6 @@ void zmq::stream_engine_t::mechanism_ready ()
properties_t properties; properties_t properties;
properties_t::const_iterator it; properties_t::const_iterator it;
// Add ZMTP properties.
const properties_t& zmtp_properties = mechanism->get_zmtp_properties ();
it = zmtp_properties.begin ();
while (it != zmtp_properties.end ()) {
properties.insert (properties_t::value_type (it->first, it->second));
it++;
}
// Add ZAP properties. // Add ZAP properties.
const properties_t& zap_properties = mechanism->get_zap_properties (); const properties_t& zap_properties = mechanism->get_zap_properties ();
it = zap_properties.begin (); it = zap_properties.begin ();
@@ -758,6 +750,14 @@ void zmq::stream_engine_t::mechanism_ready ()
it++; it++;
} }
// Add ZMTP properties.
const properties_t& zmtp_properties = mechanism->get_zmtp_properties ();
it = zmtp_properties.begin ();
while (it != zmtp_properties.end ()) {
properties.insert (properties_t::value_type (it->first, it->second));
it++;
}
zmq_assert (metadata == NULL); zmq_assert (metadata == NULL);
if (!properties.empty ()) if (!properties.empty ())
metadata = new (std::nothrow) metadata_t (properties); metadata = new (std::nothrow) metadata_t (properties);