Skip to content

Commit 1b7bbdf

Browse files
committed
simplify logic
1 parent 1433cee commit 1b7bbdf

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

src/CMQMaster.h

+6-7
Original file line numberDiff line numberDiff line change
@@ -131,16 +131,15 @@ class CMQMaster {
131131
auto &via_env = peers[w.via].env;
132132
for (auto &str : new_env) {
133133
w.env.insert(str);
134-
if (via_env.find(str) != via_env.end()) {
135-
// std::cout << "+from_proxy " << str << "\n";
136-
proxy_add_env.push_back(str);
137-
continue;
138-
} else {
134+
if (via_env.find(str) == via_env.end()) {
139135
// std::cout << "+from_master " << str << "\n";
140136
via_env.insert(str);
137+
mp.push_back(zmq::message_t(str));
138+
mp.push_back(zmq::message_t(env[str].data(), env[str].size()));
139+
} else {
140+
// std::cout << "+from_proxy " << str << "\n";
141+
proxy_add_env.push_back(str);
141142
}
142-
mp.push_back(zmq::message_t(str));
143-
mp.push_back(zmq::message_t(env[str].data(), env[str].size()));
144143
}
145144
mp.push_back(r2msg(Rcpp::wrap(proxy_add_env)));
146145
}

0 commit comments

Comments
 (0)