diff options
| author | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2013-02-20 21:13:02 (GMT) |
|---|---|---|
| committer | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2013-02-20 21:13:02 (GMT) |
| commit | a56f28b0db56ff3e39f0b50e4c55c52b7aeec696 (patch) | |
| tree | 41cf67ea5cee9593e86272ab55367653fbd1c2f3 /src/uscxml/concurrency/eventqueue | |
| parent | 7c779099b3acd1fa969dde718299484ebe0d2775 (diff) | |
| download | uscxml-a56f28b0db56ff3e39f0b50e4c55c52b7aeec696.zip uscxml-a56f28b0db56ff3e39f0b50e4c55c52b7aeec696.tar.gz uscxml-a56f28b0db56ff3e39f0b50e4c55c52b7aeec696.tar.bz2 | |
See detailled log
- Builds on windows again
- All HTTP requests are no passed into interpreter
- New response element to reply with data
- Moved basichttp URL
- New HTTP servlet invoker to register additional URLs
- More bugfixes than I care to mention
Diffstat (limited to 'src/uscxml/concurrency/eventqueue')
| -rw-r--r-- | src/uscxml/concurrency/eventqueue/DelayedEventQueue.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/uscxml/concurrency/eventqueue/DelayedEventQueue.cpp b/src/uscxml/concurrency/eventqueue/DelayedEventQueue.cpp index 4390927..e0b5a8d 100644 --- a/src/uscxml/concurrency/eventqueue/DelayedEventQueue.cpp +++ b/src/uscxml/concurrency/eventqueue/DelayedEventQueue.cpp @@ -17,7 +17,7 @@ DelayedEventQueue::DelayedEventQueue() { DelayedEventQueue::~DelayedEventQueue() { // std::cout << "Deleting DelayedEventQueue" << std::endl; stop(); - if (_thread) + if (_thread && _isStarted) _thread->join(); if(_eventLoop) event_base_free(_eventLoop); @@ -66,6 +66,7 @@ void DelayedEventQueue::cancelEvent(std::string eventId) { void DelayedEventQueue::start() { _isStarted = true; _thread = new tthread::thread(DelayedEventQueue::run, this); + _isStarted = false; } void DelayedEventQueue::stop() { |