Changeset 15140

Timestamp:

03/22/13 23:28:01 (12 years ago)

Author:

tbretz

Message:

Improved handling of exceptions coming from included files. This allows to catch exceptions from the included file.

File:

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

trunk/FACT++/src/InterpreterV8.cc

@@ -697 +697 @@
         const bool rc = ExecuteFile(*file);
         if (exception.HasCaught())
+        {
+            // If this is called from the main thread, re-throw
+            if (fThreadId==V8::GetCurrentThreadId())
+                return exception.ReThrow();
+
+            // Otherwise, handle the exception...
             HandleException(exception, "include");
+        }
         if (!rc)
         {
+            // ...and stop the thread immediately (if this is not done,
+            // the other threads might still proceed);
             V8::TerminateExecution(fThreadId);
             return ThrowException(Null());
@@ -1990 +1999 @@
     if (exception.HasCaught())
     {
-        if (file=="internal")
+        if (file=="internal" || (fThreadId==V8::GetCurrentThreadId() && !main))
             return exception.ReThrow();