From c577193ae45e4a50abd2c0345a1aa6dc26e4e457 Mon Sep 17 00:00:00 2001
From: Frank Celler <frank@arangodb.com>
Date: Mon, 15 Sep 2014 23:18:10 +0200
Subject: [PATCH] added log of exception

---
 arangod/V8Server/ApplicationV8.cpp | 8 ++++++++
 arangod/V8Server/v8-vocbase.cpp    | 1 +
 2 files changed, 9 insertions(+)

diff --git a/arangod/V8Server/ApplicationV8.cpp b/arangod/V8Server/ApplicationV8.cpp
index 3bae906e6f..d1100859bc 100644
--- a/arangod/V8Server/ApplicationV8.cpp
+++ b/arangod/V8Server/ApplicationV8.cpp
@@ -223,11 +223,19 @@ void ApplicationV8::V8Context::handleGlobalContextMethods () {
     bool allowUseDatabase = v8g->_allowUseDatabase;
     v8g->_allowUseDatabase = true;
 
+    v8::TryCatch tryCatch;
+
     TRI_ExecuteJavaScriptString(_context,
                                 v8::String::New(func.c_str(), (int) func.size()),
                                 v8::String::New("global context method"),
                                 false);
 
+    if (tryCatch.HasCaught()) {
+      if (tryCatch.CanContinue()) {
+        TRI_LogV8Exception(&tryCatch);
+      }
+    }
+
     v8g->_allowUseDatabase = allowUseDatabase;
   }
 }
diff --git a/arangod/V8Server/v8-vocbase.cpp b/arangod/V8Server/v8-vocbase.cpp
index e410ae7f1b..f267ce5ae7 100644
--- a/arangod/V8Server/v8-vocbase.cpp
+++ b/arangod/V8Server/v8-vocbase.cpp
@@ -3483,6 +3483,7 @@ static v8::Handle<v8::Value> ExecuteQueryNativeAhuacatl (TRI_aql_context_t* cont
   }
 
   TRI_ASSERT(codeLength > 0);
+
   // execute code
   v8::Handle<v8::Value> result = TRI_ExecuteJavaScriptString(v8::Context::GetCurrent(),
                                                              v8::String::New(code, (int) codeLength),