From 1b7bbdffb682bb663e9c9d6121f64a1cd31b7b84 Mon Sep 17 00:00:00 2001 From: Michael Schubert Date: Wed, 3 Jan 2024 21:12:26 +0100 Subject: [PATCH] simplify logic --- src/CMQMaster.h | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/CMQMaster.h b/src/CMQMaster.h index 8d755c6..a6725d2 100644 --- a/src/CMQMaster.h +++ b/src/CMQMaster.h @@ -131,16 +131,15 @@ class CMQMaster { auto &via_env = peers[w.via].env; for (auto &str : new_env) { w.env.insert(str); - if (via_env.find(str) != via_env.end()) { -// std::cout << "+from_proxy " << str << "\n"; - proxy_add_env.push_back(str); - continue; - } else { + if (via_env.find(str) == via_env.end()) { // std::cout << "+from_master " << str << "\n"; via_env.insert(str); + mp.push_back(zmq::message_t(str)); + mp.push_back(zmq::message_t(env[str].data(), env[str].size())); + } else { +// std::cout << "+from_proxy " << str << "\n"; + proxy_add_env.push_back(str); } - mp.push_back(zmq::message_t(str)); - mp.push_back(zmq::message_t(env[str].data(), env[str].size())); } mp.push_back(r2msg(Rcpp::wrap(proxy_add_env))); }