From fd38799049b9f1fac9258f202cf9ecfccecb5372 Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pfalcon@users.sourceforge.net>
Date: Wed, 7 Oct 2015 07:39:41 +0300
Subject: [PATCH] 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".
---
unix/modjni.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/unix/modjni.c b/unix/modjni.c
index f04ff148a..2dfe7f782 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
--
GitLab