Fix Issue #40 autoboxing of None key or values

Change-Id: Ib836eed7e2d8f68449ff8e853426401e4af2e6a6
ninia · Feb 24, 2016 · 8144158 · 8144158
1 parent bc2edaf
commit 8144158
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/jep/pyembed.c b/src/jep/pyembed.c
@@ -1239,11 +1239,11 @@ jobject pyembed_box_py(JNIEnv *env, PyObject *result)
         pos = 0;
         while (PyDict_Next(result, &pos, &key, &value)) {
             jkey = pyembed_box_py(env, key);
-            if (!jkey) {
+            if (jkey == NULL && PyErr_Occurred()) {
                 return NULL;
             }
             jvalue = pyembed_box_py(env, value);
-            if (!jvalue) {
+            if (jvalue == NULL && PyErr_Occurred()) {
                 return NULL;
             }