diff options
author | Stefan Radomski <github@mintwerk.de> | 2016-10-25 11:59:18 (GMT) |
---|---|---|
committer | Stefan Radomski <github@mintwerk.de> | 2016-10-25 11:59:18 (GMT) |
commit | 954a1eb75f2abc81da1e09701d700674f0baddfb (patch) | |
tree | 873eb6412e958ecd53214ddbd6a3e17465da5100 /src/uscxml/plugins/invoker/dirmon | |
parent | 1a1513c6497e8818eb2a92a8fbf77d4c60bc911e (diff) | |
download | uscxml-954a1eb75f2abc81da1e09701d700674f0baddfb.zip uscxml-954a1eb75f2abc81da1e09701d700674f0baddfb.tar.gz uscxml-954a1eb75f2abc81da1e09701d700674f0baddfb.tar.bz2 |
Worked on PROMELA transformation
Diffstat (limited to 'src/uscxml/plugins/invoker/dirmon')
-rw-r--r-- | src/uscxml/plugins/invoker/dirmon/DirMonInvoker.cpp | 16 | ||||
-rw-r--r-- | src/uscxml/plugins/invoker/dirmon/DirMonInvoker.h | 6 |
2 files changed, 11 insertions, 11 deletions
diff --git a/src/uscxml/plugins/invoker/dirmon/DirMonInvoker.cpp b/src/uscxml/plugins/invoker/dirmon/DirMonInvoker.cpp index f3b429f..08a0be8 100644 --- a/src/uscxml/plugins/invoker/dirmon/DirMonInvoker.cpp +++ b/src/uscxml/plugins/invoker/dirmon/DirMonInvoker.cpp @@ -134,8 +134,8 @@ void DirMonInvoker::invoke(const std::string& source, const Event& req) { std::multimap<std::string, Data>::const_iterator dirIter = req.params.find("dir"); while(dirIter != req.params.upper_bound("dir")) { // this is simplified - Data might be more elaborate than a simple string atom - URL url = URL::resolve(dirIter->second.atom, _interpreter->getBaseURL()); - + URL url = URL::resolve(dirIter->second.atom, _interpreter->getBaseURL()); + if (!url.isAbsolute()) { LOG(ERROR) << "Given directory '" << dirIter->second << "' cannot be transformed to absolute path"; } else { @@ -153,13 +153,13 @@ void DirMonInvoker::invoke(const std::string& source, const Event& req) { } void DirMonInvoker::uninvoke() { - _isRunning = false; - if (_thread) { - _thread->join(); - delete _thread; - } + _isRunning = false; + if (_thread) { + _thread->join(); + delete _thread; + } } - + void DirMonInvoker::run(void* instance) { while(((DirMonInvoker*)instance)->_isRunning) { { diff --git a/src/uscxml/plugins/invoker/dirmon/DirMonInvoker.h b/src/uscxml/plugins/invoker/dirmon/DirMonInvoker.h index be510d9..6e13864 100644 --- a/src/uscxml/plugins/invoker/dirmon/DirMonInvoker.h +++ b/src/uscxml/plugins/invoker/dirmon/DirMonInvoker.h @@ -107,9 +107,9 @@ public: } virtual Data getDataModelVariables(); - virtual void eventFromSCXML(const Event& event); - virtual void invoke(const std::string& source, const Event& invokeEvent); - virtual void uninvoke(); + virtual void eventFromSCXML(const Event& event); + virtual void invoke(const std::string& source, const Event& invokeEvent); + virtual void uninvoke(); virtual void handleChanges(DirectoryWatch::Action action, const std::string dir, const std::string file, struct stat fileStat); |