zorba-coders team mailing list archive

[Matthias Brantner <matthias.brantner@xxxxxxxxxx>]

Matthias Brantner has proposed merging lp:~zorba-coders/zorba/fix-external_func_exceptions into lp:zorba.

Commit message:
also intercept ZorbaException such that it's not wrapped into a general dynamic exception

Requested reviews:
  Matthias Brantner (matthias-brantner)
  Cristian Dumitru (cdumitru)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/fix-external_func_exceptions/+merge/201262
-- 
https://code.launchpad.net/~zorba-coders/zorba/fix-external_func_exceptions/+merge/201262
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'src/runtime/core/fncall_iterator.cpp'
--- src/runtime/core/fncall_iterator.cpp	2014-01-08 21:49:13 +0000
+++ src/runtime/core/fncall_iterator.cpp	2014-01-10 22:35:31 +0000
@@ -911,6 +911,11 @@
     set_source( e, loc );
     throw;
   }
+  catch (ZorbaException& e)
+  {
+    set_source( e, loc );
+    throw;
+  }
   catch (std::exception& e)
   {
     throw XQUERY_EXCEPTION(