2 files changed, 4 insertions, 4 deletions
diff --git a/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.cpp b/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.cpp
index a064394..a6909b5 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.cpp
+++ b/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.cpp
@@ -222,7 +222,7 @@ void JSCDataModel::setEvent(const Event& event) {
 	} else if (event.content.length() > 0) {
 		// _event.data is a string or JSON
 		Data json = Data::fromJSON(event.content);
-		if (json) {
+		if (!json.empty()) {
 			JSStringRef propName = JSStringCreateWithUTF8CString("data");
 			JSObjectSetProperty(_ctx, eventObj, propName, getDataAsValue(json), 0, &exception);
 			JSStringRelease(propName);
@@ -255,7 +255,7 @@ void JSCDataModel::setEvent(const Event& event) {
 				nameListIter++;
 			}
 		}
-		if (eventCopy.data > 0) {
+		if (!eventCopy.data.empty()) {
 			JSStringRef propName = JSStringCreateWithUTF8CString("data");
 			JSObjectSetProperty(_ctx, eventObj, propName, getDataAsValue(eventCopy.data), 0, &exception);
 			JSStringRelease(propName);
diff --git a/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.cpp b/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.cpp
index ec9557e..2bdd796 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.cpp
+++ b/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.cpp
@@ -233,7 +233,7 @@ void V8DataModel::setEvent(const Event& event) {
 	} else if (event.content.length() > 0) {
 		// _event.data is a string or JSON
 		Data json = Data::fromJSON(event.content);
-		if (json) {
+		if (!json.empty()) {
 			eventObj->Set(v8::String::New("data"), getDataAsValue(json));
 		} else {
 			eventObj->Set(v8::String::New("data"), v8::String::New(InterpreterImpl::spaceNormalize(event.content).c_str()));
@@ -255,7 +255,7 @@ void V8DataModel::setEvent(const Event& event) {
 				nameListIter++;
 			}
 		}
-		if (eventCopy.data) {
+		if (!eventCopy.data.empty()) {
 //			std::cout << Data::toJSON(eventCopy.data);
 			eventObj->Set(v8::String::New("data"), getDataAsValue(eventCopy.data)); // set data part of _event
 		} else {