Changeset 18383 for trunk/FACT++/src

Timestamp:

11/24/15 13:26:53 (9 years ago)

Author:

Daniela Dorner

Message:

fixed bug in interrupt that made dimserver crash

File:

• trunk/FACT++/src/InterpreterV8.cc (modified) (3 diffs)

trunk/FACT++/src/InterpreterV8.cc

@@ -1452 +1452 @@
 void InterpreterV8::JsHandleEvent(const EventImp &evt, uint64_t cnt, const string &service)
 {
+    // FIXME: This blocks service updates, we have to run this
+    //        in a dedicated thread.
     const Locker locker;
 
@@ -1520 +1522 @@
 void InterpreterV8::JsHandleState(const std::string &server, const State &state)
 {
+    // FIXME: This blocks service updates, we have to run this
+    //        in a dedicated thread.
     const Locker locker;
 
@@ -1626 +1630 @@
 int InterpreterV8::JsHandleInterrupt(const EventImp &evt)
 {
+    // FIXME: This blocks service updates, we have to run this
+    //        in a dedicated thread.
     const Locker locker;
 
-    if (fThreadId<0)
+    if (fThreadId<0 || fInterruptCallback.IsEmpty())
         return -42;