diff options
author | Stefan Radomski <github@mintwerk.de> | 2017-04-26 16:28:10 (GMT) |
---|---|---|
committer | Stefan Radomski <github@mintwerk.de> | 2017-04-26 16:28:10 (GMT) |
commit | 3a7350b931705b2ab3aa6f1516512e37038e9899 (patch) | |
tree | 2437b9dd1fae15e947b2de5b757c77947fb341ab /src/uscxml | |
parent | 199d27c0f613e54369865ad73ffcb523ee8930fd (diff) | |
download | uscxml-3a7350b931705b2ab3aa6f1516512e37038e9899.zip uscxml-3a7350b931705b2ab3aa6f1516512e37038e9899.tar.gz uscxml-3a7350b931705b2ab3aa6f1516512e37038e9899.tar.bz2 |
Fixed issue110
Diffstat (limited to 'src/uscxml')
-rw-r--r-- | src/uscxml/plugins/datamodel/lua/LuaDataModel.cpp | 3 | ||||
-rw-r--r-- | src/uscxml/plugins/invoker/scxml/USCXMLInvoker.cpp | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/uscxml/plugins/datamodel/lua/LuaDataModel.cpp b/src/uscxml/plugins/datamodel/lua/LuaDataModel.cpp index 647738a..890b8cf 100644 --- a/src/uscxml/plugins/datamodel/lua/LuaDataModel.cpp +++ b/src/uscxml/plugins/datamodel/lua/LuaDataModel.cpp @@ -227,7 +227,7 @@ std::shared_ptr<DataModelImpl> LuaDataModel::create(DataModelCallbacks* callback } } } catch (luabridge::LuaException e) { - LOG(_callbacks->getLogger(), USCXML_INFO) << e.what(); + LOG(dm->_callbacks->getLogger(), USCXML_INFO) << e.what(); } luabridge::getGlobalNamespace(dm->_luaState).beginClass<LuaDataModel>("DataModel").endClass(); @@ -561,7 +561,6 @@ void LuaDataModel::assign(const std::string& location, const Data& data, const s } - // std::cout << Data::toJSON(evalAsData(location)) << std::endl; } } diff --git a/src/uscxml/plugins/invoker/scxml/USCXMLInvoker.cpp b/src/uscxml/plugins/invoker/scxml/USCXMLInvoker.cpp index e0812d0..1248205 100644 --- a/src/uscxml/plugins/invoker/scxml/USCXMLInvoker.cpp +++ b/src/uscxml/plugins/invoker/scxml/USCXMLInvoker.cpp @@ -184,7 +184,7 @@ void USCXMLInvoker::invoke(const std::string& source, const Event& invokeEvent) InterpreterImpl* invoked = _invokedInterpreter.getImpl().get(); ActionLanguage* alOrig = _callbacks->getActionLanguage(); if (alOrig != NULL) { - ActionLanguage al = *alOrig; // invokes copy operator + ActionLanguage al; // create new instances al.execContent = alOrig->execContent.getImpl()->create(invoked); al.delayQueue = alOrig->delayQueue.getImplDelayed()->create(invoked); |