xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Issue #1832 fix getNumPy() error handling" into omaha_13.3.1

Browse source 
Former-commit-id: 2d5ec59d57 [formerly caeb823043] [formerly dd3601a873] [formerly 2d5ec59d57 [formerly caeb823043] [formerly dd3601a873] [formerly aaf2d7bc2a [formerly dd3601a873 [formerly f1cabae64e37120f27235ec44b4bd7a1921fe621]]]]
Former-commit-id: aaf2d7bc2a
Former-commit-id: ad691d7deb [formerly adeeccc9c7] [formerly ece186ad016279cdd4244f8b4cc68f07db841659 [formerly da024a1044]]
Former-commit-id: cdd0c64ff7111693a18db23487701788c8d05df7 [formerly 329a106ef3]
Former-commit-id: 185b0ebbc2
This commit is contained in:
Nate Jensen 2013-03-27 11:16:56 -05:00 • committed by Gerrit Code Review
commit b54bc5364f
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nativeLib/rary.cots.jepp/jepp-2.3/src/jep/pyjobject.c
View file

@ -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;