Changeset 14640 for trunk/FACT++

Timestamp:

11/17/12 15:33:57 (12 years ago)

Author:

tbretz

Message:

Fixed a problem with the onchange of services because the return value of ConvertEvent had changed; fixed a problem with proceeding excution of the exit()-calling thread.

File:

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

trunk/FACT++/src/InterpreterV8.cc

@@ -87 +87 @@
 {
     V8::TerminateExecution(fThreadId);
-    return Undefined();
+
+    // we have to throw an excption to make sure that the
+    // calling thread does not go on executing until it
+    // has realized that it should terminate
+    return ThrowException(Null());
 }
 
@@ -1017 +1021 @@
 
     // -------------------------------------------------------------------
+
     TryCatch exception;
 
@@ -1023 +1028 @@
 
     Handle<Value> ret = ConvertEvent(&evt, cnt, service.c_str());
-    if (ret->IsArray())
-    {
-        Handle<Array> data = Handle<Array>::Cast(ret);
-        Handle<Value> args[] = { data };
-
-        Handle<Function>::Cast(val)->Call(obj, 1, args);
-    }
+    if (ret->IsObject())
+        Handle<Function>::Cast(val)->Call(obj, 1, &ret);
 
     fThreadIds.erase(id);