Merge pull request #1643 from somdoron/master

Problem: when STREAM socket HWM is reached an assert will happen as metadata is trying to set twice
This commit is contained in:
Pieter Hintjens 2015-11-19 13:47:28 +02:00
commit 4f7dc49642

View File

@ -869,7 +869,7 @@ int zmq::stream_engine_t::push_msg_to_session (msg_t *msg_)
} }
int zmq::stream_engine_t::push_raw_msg_to_session (msg_t *msg_) { int zmq::stream_engine_t::push_raw_msg_to_session (msg_t *msg_) {
if (metadata) if (metadata && metadata != msg_->metadata())
msg_->set_metadata(metadata); msg_->set_metadata(metadata);
return push_msg_to_session(msg_); return push_msg_to_session(msg_);
} }