mirrors
/
micropython
mirror of https://github.com/micropython/micropython.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

unix/modjni: Propagate Java exceptions on list access.

This commit is contained in:
Paul Sokolovsky 2015-10-01 01:19:33 -07:00
parent 0eba162ab5
commit c4489a0543
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
unix/modjni.c
View File

@ -92,6 +92,16 @@ STATIC bool is_object_type(const char *jtypesig) {
return false;
}
STATIC void check_exception(void) {
jobject exc = JJ1(ExceptionOccurred);
if (exc) {
//JJ1(ExceptionDescribe);
mp_obj_t py_e = new_jobject(exc);
JJ1(ExceptionClear);
nlr_raise(mp_obj_new_exception_arg1(&mp_type_Exception, py_e));
}
}
// jclass
STATIC void jclass_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
@ -200,6 +210,9 @@ STATIC mp_obj_t jobject_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value)
} else if (value == MP_OBJ_SENTINEL) {
// load
jobject el = JJ(CallObjectMethod, self->obj, List_get_mid, idx);
if (el == NULL) {
check_exception();
}
return new_jobject(el);
} else {
// store