Commit fd387990 authored by Paul Sokolovsky's avatar Paul Sokolovsky
Browse files

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".
parent fa391eed
...@@ -230,9 +230,7 @@ STATIC mp_obj_t jobject_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) ...@@ -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) { } else if (value == MP_OBJ_SENTINEL) {
// load // load
jobject el = JJ(CallObjectMethod, self->obj, List_get_mid, idx); jobject el = JJ(CallObjectMethod, self->obj, List_get_mid, idx);
if (el == NULL) { check_exception();
check_exception();
}
return new_jobject(el); return new_jobject(el);
} else { } else {
// store // store
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment