Fix: exception caused by failure to find schema file not being swig-w…

…rapped correctly.
bengioe · Aug 23, 2016 · a5fe2a9 · a5fe2a9
1 parent f845f24
commit a5fe2a9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/Malmo/src/CSharpWrapper/MalmoNETNative.i b/Malmo/src/CSharpWrapper/MalmoNETNative.i
@@ -298,6 +298,10 @@ public:
       std::ostringstream oss;
       oss << "Caught xml_schema::exception: " << e.what() << "\n" << e;
       SWIG_CSharpSetPendingException(SWIG_CSharpApplicationException, oss.str().c_str());
+    } catch (const std::runtime_error& e) {
+      std::ostringstream oss;
+      oss << "Caught std::runtime_error: " << e.what();
+      SWIG_CSharpSetPendingException(SWIG_CSharpApplicationException, oss.str().c_str());
     }
   %}
 

diff --git a/Malmo/src/JavaWrapper/MalmoJava.i b/Malmo/src/JavaWrapper/MalmoJava.i
@@ -284,6 +284,11 @@ public:
       oss << "Caught xml_schema::exception: " << e.what() << "\n" << e;
       jclass clazz = jenv->FindClass("java/lang/Exception");
       jenv->ThrowNew(clazz, oss.str().c_str());
+    } catch (const std::runtime_error& e) {
+      std::ostringstream oss;
+      oss << "Caught std::runtime_error: " << e.what();
+      jclass clazz = jenv->FindClass("java/lang/Exception");
+      jenv->ThrowNew(clazz, oss.str().c_str());
     }
   %}