diff options
| author | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2014-05-23 10:50:59 (GMT) |
|---|---|---|
| committer | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2014-05-23 10:50:59 (GMT) |
| commit | 9f3dfcd9982cff90cf0466413d17fc1061c43f00 (patch) | |
| tree | e29d0f70ecdfb742e3bbbc522e87281c8bbd58e7 /src/uscxml/server | |
| parent | 216e8efb0f1aff9afd3881ab89b49e017e255228 (diff) | |
| download | uscxml-9f3dfcd9982cff90cf0466413d17fc1061c43f00.zip uscxml-9f3dfcd9982cff90cf0466413d17fc1061c43f00.tar.gz uscxml-9f3dfcd9982cff90cf0466413d17fc1061c43f00.tar.bz2 | |
Fixed the 100% CPU utilization bug and replaced the bool() cast operator for data by empty()
Diffstat (limited to 'src/uscxml/server')
| -rw-r--r-- | src/uscxml/server/InterpreterServlet.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/uscxml/server/InterpreterServlet.cpp b/src/uscxml/server/InterpreterServlet.cpp index 303aad0..2bbb856 100644 --- a/src/uscxml/server/InterpreterServlet.cpp +++ b/src/uscxml/server/InterpreterServlet.cpp @@ -55,13 +55,13 @@ bool InterpreterHTTPServlet::httpRecvRequest(const HTTPServer::Request& req) { event.name = "http." + event.data.compound["type"].atom; event.origin = toStr((uintptr_t)req.evhttpReq); - if (event.data.compound["content"]) { + if (!event.data.compound["content"].empty()) { if (event.data.compound["content"].compound.size() > 0) { std::map<std::string, Data>::iterator compoundIter = event.data.compound["content"].compound.begin(); while(compoundIter != event.data.compound["content"].compound.end()) { // std::cout << compoundIter->second.atom << std::endl; Data json = Data::fromJSON(compoundIter->second.atom); - if (json) { + if (!json.empty()) { // std::cout << Data::toJSON(json) << std::endl; compoundIter->second = json; } @@ -119,12 +119,12 @@ bool InterpreterWebSocketServlet::wsRecvRequest(struct evws_connection *conn, co event.name = "ws." + event.data.compound["type"].atom; event.origin = toStr((uintptr_t)conn); - if (event.data.compound["type"].atom.compare("text") == 0 && event.data.compound["content"]) { + if (event.data.compound["type"].atom.compare("text") == 0 && !event.data.compound["content"].empty()) { if (event.data.compound["content"].compound.size() > 0) { std::map<std::string, Data>::iterator compoundIter = event.data.compound["content"].compound.begin(); while(compoundIter != event.data.compound["content"].compound.end()) { Data json = Data::fromJSON(compoundIter->second.atom); - if (json) { + if (!json.empty()) { compoundIter->second = json; } compoundIter++; @@ -145,7 +145,7 @@ Data InterpreterWebSocketServlet::getDataModelVariables() { void InterpreterWebSocketServlet::send(const SendRequest& req) { - if (!req.data) { + if (req.data.empty()) { LOG(WARNING) << "No content given to send on websocket!"; return; } @@ -166,7 +166,7 @@ void InterpreterWebSocketServlet::send(const SendRequest& req) { EVWS_TEXT_FRAME, data.c_str(), data.length()); - } else if (req.data) { + } else if (!req.data.empty()) { std::string data = Data::toJSON(req.data); HTTPServer::wsSend(_requests[req.target], EVWS_TEXT_FRAME, @@ -191,7 +191,7 @@ void InterpreterWebSocketServlet::send(const SendRequest& req) { EVWS_TEXT_FRAME, data.c_str(), data.length()); - } else if (req.data) { + } else if (!req.data.empty()) { std::string data = Data::toJSON(req.data); HTTPServer::wsBroadcast(req.target.c_str(), EVWS_TEXT_FRAME, |