Commit c32bfa79 authored by Michal 'vorner' Vaner's avatar Michal 'vorner' Vaner
Browse files

[2768] Remove some more references

They save only little bit of work to the CPU and are suspicious to
casual reader, even when they should be safe in theory.
parent 8bab20ff
......@@ -869,7 +869,7 @@ ModuleCCSession::rpcCall(const std::string &command, const std::string &group,
arg(group).arg(seq);
groupRecvMsg(env, answer, true, seq);
int rcode;
const ConstElementPtr &result(parseAnswer(rcode, answer));
const ConstElementPtr result(parseAnswer(rcode, answer));
if (rcode == isc::cc::CC_REPLY_NO_RECPT) {
isc_throw(RPCRecipientMissing, result);
} else if (rcode != isc::cc::CC_REPLY_SUCCESS) {
......
......@@ -62,16 +62,18 @@ protected:
ModuleCCSession mccs(ccspecfile("spec1.spec"), session, NULL, NULL,
false, false);
// Prepare the answer beforehand, it'll block until it gets one
const ConstElementPtr& reply_el(el(reply));
const ConstElementPtr reply_el(el(reply));
session.getMessages()->add(reply_el);
const ConstElementPtr& result(mccs.rpcCall("test", "Spec2",
el("{\"param1\": \"Param 1\","
"\"param2\": \"Param 2\"}")));
const ConstElementPtr& request(el("[\"Spec2\", \"*\", {"
" \"command\": [\"test\", {"
" \"param1\": \"Param 1\","
" \"param2\": \"Param 2\""
"}]}, -1, true]"));
const ConstElementPtr
result(mccs.rpcCall("test", "Spec2",
el("{\"param1\": \"Param 1\","
"\"param2\": \"Param 2\"}")));
const ConstElementPtr
request(el("[\"Spec2\", \"*\", {"
" \"command\": [\"test\", {"
" \"param1\": \"Param 1\","
" \"param2\": \"Param 2\""
"}]}, -1, true]"));
// The 0th one is from the initialization, to ConfigManager.
// our is the 1st.
EXPECT_TRUE(request->equals(*session.getMsgQueue()->get(1))) <<
......@@ -88,7 +90,7 @@ protected:
// Test we can send an RPC (command) and get an answer. The answer is success
// in this case.
TEST_F(CCSessionTest, rpcCallSuccess) {
const ConstElementPtr &result =
const ConstElementPtr result =
rpcCheck("{\"result\": [0, {\"Hello\": \"a\"}]}");
EXPECT_TRUE(el("{\"Hello\": \"a\"}")->equals(*result));
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment