ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-27 14:35:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:jedmccaleb/NewCoin

Browse Source
This commit is contained in:
Arthur Britto
2012-11-20 18:52:48 -08:00
parent 9755563e18 0c2bc43492
commit f98741af3c
2 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/cpp/ripple/WSConnection.cpp
View File

@@ -49,12 +49,15 @@ Json::Value WSConnection::invokeCommand(Json::Value& jvRequest)
Json::Value jvResult(Json::objectValue);
// Regular RPC command
jvResult["result"] = mRPCHandler.doCommand(
jvRequest["command"].asString(),
jvRequest.isMember("params")
? jvRequest["params"]
: jvRequest,
mHandler->getPublic() ? RPCHandler::GUEST : RPCHandler::ADMIN);
{
boost::recursive_mutex::scoped_lock sl(theApp->getMasterLock());
jvResult["result"] = mRPCHandler.doCommand(
jvRequest["command"].asString(),
jvRequest.isMember("params")
? jvRequest["params"]
: jvRequest,
mHandler->getPublic() ? RPCHandler::GUEST : RPCHandler::ADMIN);
}
// Currently we will simply unwrap errors returned by the RPC
// API, in the future maybe we can make the responses

9
src/cpp/ripple/WSHandler.h
View File

@@ -116,7 +116,14 @@ public:
}
else
{
send(cpClient, mMap[cpClient]->invokeCommand(jvRequest));
boost::shared_ptr<WSConnection> conn;
{
boost::mutex::scoped_lock sl(mMapLock);
conn = mMap[cpClient];
}
if (!conn)
return;
send(cpClient, conn->invokeCommand(jvRequest));
}
}