diff options
| author | Paul Sokolovsky <pfalcon@users.sourceforge.net> | 2015-10-07 07:39:41 +0300 |
|---|---|---|
| committer | Paul Sokolovsky <pfalcon@users.sourceforge.net> | 2015-10-07 07:40:29 +0300 |
| commit | fd38799049b9f1fac9258f202cf9ecfccecb5372 (patch) | |
| tree | 9f339ca37ffd4d11619d62be38880309b3ee89a2 | |
| parent | fa391eed9d2598b05ed7e0e10d38d7b597abcd19 (diff) | |
| download | micropython-fd38799049b9f1fac9258f202cf9ecfccecb5372.tar.gz micropython-fd38799049b9f1fac9258f202cf9ecfccecb5372.zip | |
unix/modjni: After Call*Method(), Java exception should always be checked.
OpenJDK seemed to return NULL in case of exception, but Dalvik returns
arbitrary value, so skip such "optimizations".
| -rw-r--r-- | unix/modjni.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/unix/modjni.c b/unix/modjni.c index f04ff148ad..2dfe7f7824 100644 --- a/unix/modjni.c +++ b/unix/modjni.c @@ -230,9 +230,7 @@ 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(); - } + check_exception(); return new_jobject(el); } else { // store |