Fixed the 100% CPU utilization bug and replaced the bool() cast operator for data by empty()

6 files changed, 10 insertions, 10 deletions

diff --git a/src/uscxml/plugins/invoker/CMakeLists.txt b/src/uscxml/plugins/invoker/CMakeLists.txt
index 8ae4516..ceb9c90 100644
--- a/src/uscxml/plugins/invoker/CMakeLists.txt
+++ b/src/uscxml/plugins/invoker/CMakeLists.txt
@@ -109,7 +109,7 @@ if (EXPECT_FOUND AND TCL_FOUND)
 			invoker_expect SHARED 
 			${EXPECT_INVOKER}
 			"../Plugins.cpp")
-		target_link_libraries(invoker_expect uscxml)
+		target_link_libraries(invoker_expect uscxml ${EXPECT_LIBRARY} ${TCL_LIBRARY})
 		set_target_properties(invoker_expect PROPERTIES FOLDER "Plugin Invoker")
 	else()
 		list (APPEND USCXML_FILES ${EXPECT_INVOKER})
diff --git a/src/uscxml/plugins/invoker/ffmpeg/FFMPEGInvoker.cpp b/src/uscxml/plugins/invoker/ffmpeg/FFMPEGInvoker.cpp
index f43e406..b6203d4 100644
--- a/src/uscxml/plugins/invoker/ffmpeg/FFMPEGInvoker.cpp
+++ b/src/uscxml/plugins/invoker/ffmpeg/FFMPEGInvoker.cpp
@@ -250,7 +250,7 @@ void FFMPEGInvoker::process(const SendRequest& req) {
 
 	Data image;
 	Event::getParam(req.params, "frame", image);
-	if (!image) {
+	if (image.empty()) {
 		return;
 	}
 
diff --git a/src/uscxml/plugins/invoker/graphics/openscenegraph/converter/OSGConverter.cpp b/src/uscxml/plugins/invoker/graphics/openscenegraph/converter/OSGConverter.cpp
index bc747a1..0ebf9b8 100644
--- a/src/uscxml/plugins/invoker/graphics/openscenegraph/converter/OSGConverter.cpp
+++ b/src/uscxml/plugins/invoker/graphics/openscenegraph/converter/OSGConverter.cpp
@@ -394,7 +394,7 @@ void OSGConverter::reportSuccess(const SendRequest& req, const Data& content) {
 		event.name = "convert";
 	event.name += ".success";
 
-	if (content)
+	if (!content.empty())
 		event.data.compound["content"] = content;
 	returnEvent(event);
 }
diff --git a/src/uscxml/plugins/invoker/miles/.MilesSessionInvoker.cpp.swp b/src/uscxml/plugins/invoker/miles/.MilesSessionInvoker.cpp.swp
deleted file mode 100644
index 368f327..0000000
--- a/src/uscxml/plugins/invoker/miles/.MilesSessionInvoker.cpp.swp
+++ /dev/null
diff --git a/src/uscxml/plugins/invoker/umundo/UmundoInvoker.cpp b/src/uscxml/plugins/invoker/umundo/UmundoInvoker.cpp
index c84fd8f..6ef1bd4 100644
--- a/src/uscxml/plugins/invoker/umundo/UmundoInvoker.cpp
+++ b/src/uscxml/plugins/invoker/umundo/UmundoInvoker.cpp
@@ -77,10 +77,10 @@ void UmundoInvoker::send(const SendRequest& req) {
 	try {
 		Data data = req.data;
 
-		if (!data && req.content.length())
+		if (data.empty() && req.content.length())
 			data = _interpreter->getDataModel().getStringAsData(req.content);
 
-		if (!data) {
+		if (data.empty()) {
 			LOG(ERROR) << "Cannot transform content to data object per datamodel or no data given";
 			return;
 		}
diff --git a/src/uscxml/plugins/invoker/xhtml/XHTMLInvoker.cpp b/src/uscxml/plugins/invoker/xhtml/XHTMLInvoker.cpp
index e607cf4..0418f8a 100644
--- a/src/uscxml/plugins/invoker/xhtml/XHTMLInvoker.cpp
+++ b/src/uscxml/plugins/invoker/xhtml/XHTMLInvoker.cpp
@@ -81,7 +81,7 @@ bool XHTMLInvoker::httpRecvRequest(const HTTPServer::Request& req) {
 		} else {
 			// a POST request
 			Event ev(req);
-			if (ev.data["header"]["X-SCXML-Name"]) {
+			if (ev.data["header"].hasKey("X-SCXML-Name")) {
 				ev.name = ev.data["header"]["X-SCXML-Name"].atom;
 			} else {
 				ev.name = req.data.at("type").atom;
@@ -101,7 +101,7 @@ bool XHTMLInvoker::httpRecvRequest(const HTTPServer::Request& req) {
 	}
 
 	// initial request for a document
-	if (!req.data["query"] && // no query parameters
+	if (!req.data.hasKey("query") && // no query parameters
 	        iequals(req.data.at("type").atom, "get") && // request type is GET
 	        req.content.length() == 0) { // no content
 
@@ -113,7 +113,7 @@ bool XHTMLInvoker::httpRecvRequest(const HTTPServer::Request& req) {
 //			ss << _invokeReq.getFirstDOMElement();
 			ss << _invokeReq.dom;
 			content = ss.str();
-		} else if(_invokeReq.data) {
+		} else if(!_invokeReq.data.empty()) {
 			ss << _invokeReq.data;
 			content = ss.str();
 		} else if (_invokeReq.content.length() > 0) {
@@ -163,7 +163,7 @@ void XHTMLInvoker::send(const SendRequest& req) {
 	SendRequest reqCopy(req);
 	_interpreter->getDataModel().replaceExpressions(reqCopy.content);
 	Data json = Data::fromJSON(reqCopy.content);
-	if (json) {
+	if (!json.empty()) {
 		reqCopy.data = json;
 	}
 
@@ -195,7 +195,7 @@ void XHTMLInvoker::reply(const SendRequest& req, const HTTPServer::Request& long
 		ss << req.dom;
 		reply.content = ss.str();
 		reply.headers["Content-Type"] = "application/xml";
-	} else if (req.data) {
+	} else if (!req.data.empty()) {
 		reply.content = Data::toJSON(req.data);
 		reply.headers["Content-Type"] = "application/json";
 	} else if (req.content.length() > 0) {