All changes up to my dissertation

1 files changed, 11 insertions, 1 deletions

diff --git a/src/uscxml/plugins/invoker/scxml/USCXMLInvoker.cpp b/src/uscxml/plugins/invoker/scxml/USCXMLInvoker.cpp
index 79b1829..d3aa35f 100644
--- a/src/uscxml/plugins/invoker/scxml/USCXMLInvoker.cpp
+++ b/src/uscxml/plugins/invoker/scxml/USCXMLInvoker.cpp
@@ -64,7 +64,8 @@ Data USCXMLInvoker::getDataModelVariables() {
 }
 
 void USCXMLInvoker::send(const SendRequest& req) {
-	_invokedInterpreter.receive(req);
+	if (_invokedInterpreter)
+        _invokedInterpreter.receive(req);
 }
 
 void USCXMLInvoker::cancel(const std::string sendId) {
@@ -96,6 +97,15 @@ void USCXMLInvoker::invoke(const InvokeRequest& req) {
 		DataModel dataModel(_invokedInterpreter.getImpl()->getDataModel());
 		_invokedInterpreter.getImpl()->setParentQueue(&_parentQueue);
 
+        // copy monitors
+        std::set<InterpreterMonitor*>::const_iterator monIter = _interpreter->_monitors.begin();
+        while(monIter != _interpreter->_monitors.end()) {
+            if ((*monIter)->copyToInvokers()) {
+                _invokedInterpreter.getImpl()->_monitors.insert(*monIter);
+            }
+            monIter++;
+        }
+        
 		// transfer namespace prefixes
 		_invokedInterpreter.setNameSpaceInfo(_parentInterpreter->getNameSpaceInfo());
 		_invokedInterpreter.getImpl()->_sessionId = req.invokeid;