From 91981ee9dad7247accad2b0c61f0cc7b27449fd5 Mon Sep 17 00:00:00 2001 From: Nate Jensen Date: Tue, 26 Mar 2013 18:30:19 -0500 Subject: [PATCH] Issue #1832 fix getNumPy() error handling Change-Id: If2a0d3747c38cf716c3fa431c4135f2dee7c5405 Former-commit-id: 49fdcf9e555ae53d6c1d3aee1566c49bf4eb7fa3 [formerly dc53db51810aa4d1afca5d8997ca55cc92fc3869] [formerly e4cdfe0ca95531c65aeac1b894fe7952f25331e4] [formerly 49fdcf9e555ae53d6c1d3aee1566c49bf4eb7fa3 [formerly dc53db51810aa4d1afca5d8997ca55cc92fc3869] [formerly e4cdfe0ca95531c65aeac1b894fe7952f25331e4] [formerly 74b21dc1b4fb2d8490f6181f914d4271a03b31de [formerly e4cdfe0ca95531c65aeac1b894fe7952f25331e4 [formerly ce7e89b8300580a57a5c133a78e8c84e2cb7449e]]]] Former-commit-id: 74b21dc1b4fb2d8490f6181f914d4271a03b31de Former-commit-id: d3bd10f1f2ce9611dfd5e16c51d7dee178c3dc80 [formerly 0cf9a031330c452d9f69933677d7c71330454e60] [formerly 22ed5d848545d777dd0f275f81d9601e754f7d4f [formerly 494a673c37ad2c02894368558b9478e6874650d8]] Former-commit-id: deb894038ea05f553bcc6b86032347aefd7562d8 [formerly d1d647a77848d0bcb414674ce1a17a1cab3bc0d1] Former-commit-id: d7a7b66b1d54fbc43eba85767a315889e39ef8ec --- nativeLib/rary.cots.jepp/jepp-2.3/src/jep/pyjobject.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nativeLib/rary.cots.jepp/jepp-2.3/src/jep/pyjobject.c b/nativeLib/rary.cots.jepp/jepp-2.3/src/jep/pyjobject.c index 4959cb372b..26ae6084c8 100644 --- a/nativeLib/rary.cots.jepp/jepp-2.3/src/jep/pyjobject.c +++ b/nativeLib/rary.cots.jepp/jepp-2.3/src/jep/pyjobject.c @@ -768,7 +768,7 @@ static PyObject* pyjobject_numpy(PyJobject_Object *obj) { getMethod = (*env)->GetMethodID(env, numpyable, "getNumPy", "()[Ljava/lang/Object;"); objarray = (jobjectArray) (*env)->CallObjectMethod(env, obj->object, getMethod); - if(objarray == NULL) + if(process_java_exception(env) || !objarray) { Py_INCREF(Py_None); return Py_None;