summaryrefslogtreecommitdiffstats
path: root/src/uscxml/plugins/invoker/umundo/UmundoInvoker.cpp
diff options
context:
space:
mode:
authorStefan Radomski <radomski@tk.informatik.tu-darmstadt.de>2013-01-21 23:47:54 (GMT)
committerStefan Radomski <radomski@tk.informatik.tu-darmstadt.de>2013-01-21 23:47:54 (GMT)
commit3be96d1aa3024c1acc129e587f5d3165c9434e48 (patch)
treefae65a932b899ed9424a5a76b9b98562d979fe40 /src/uscxml/plugins/invoker/umundo/UmundoInvoker.cpp
parent3bda299c6d2efce71d76b44dea8e732a073304f3 (diff)
downloaduscxml-3be96d1aa3024c1acc129e587f5d3165c9434e48.zip
uscxml-3be96d1aa3024c1acc129e587f5d3165c9434e48.tar.gz
uscxml-3be96d1aa3024c1acc129e587f5d3165c9434e48.tar.bz2
See detailed commitlog
- Started DirectoryMonitor invoker - Refactored Invoker / IOProcessor interface - Started with JavaScriptCore bindings - Embedding applications can now use setParentQueue to receive events sent to #_parent
Diffstat (limited to 'src/uscxml/plugins/invoker/umundo/UmundoInvoker.cpp')
-rw-r--r--src/uscxml/plugins/invoker/umundo/UmundoInvoker.cpp14
1 files changed, 4 insertions, 10 deletions
diff --git a/src/uscxml/plugins/invoker/umundo/UmundoInvoker.cpp b/src/uscxml/plugins/invoker/umundo/UmundoInvoker.cpp
index c269869..1e15865 100644
--- a/src/uscxml/plugins/invoker/umundo/UmundoInvoker.cpp
+++ b/src/uscxml/plugins/invoker/umundo/UmundoInvoker.cpp
@@ -80,12 +80,11 @@ void UmundoInvoker::send(const SendRequest& req) {
protobufToData(event, *(const google::protobuf::Message*)rv);
event.name = _invokeId + ".reply." + req.name;
- event.invokeid = _invokeId;
event.origin = msg->getMeta("um.channel");
event.origintype = "umundo";
event.type = Event::EXTERNAL;
- _interpreter->receive(event);
+ returnEvent(event);
svcIter++;
}
}
@@ -105,12 +104,7 @@ void UmundoInvoker::cancel(const std::string sendId) {
assert(false);
}
-void UmundoInvoker::sendToParent(const SendRequest& req) {
- assert(false);
-}
-
void UmundoInvoker::invoke(const InvokeRequest& req) {
- _invokeId = req.invokeid;
std::string domain;
std::string channelName;
@@ -201,7 +195,7 @@ void UmundoInvoker::receive(void* object, umundo::Message* msg) {
metaIter++;
}
- _interpreter->receive(event);
+ returnEvent(event);
}
void UmundoInvoker::added(umundo::ServiceDescription desc) {
@@ -223,7 +217,7 @@ void UmundoInvoker::added(umundo::ServiceDescription desc) {
propIter++;
}
- _interpreter->receive(addedEvent);
+ returnEvent(addedEvent);
}
void UmundoInvoker::removed(umundo::ServiceDescription desc) {
@@ -249,7 +243,7 @@ void UmundoInvoker::removed(umundo::ServiceDescription desc) {
propIter++;
}
- _interpreter->receive(addedEvent);
+ returnEvent(addedEvent);
}
void UmundoInvoker::changed(umundo::ServiceDescription desc) {