[bugfix] Fix bug when converting from java.lang.Short to a python int (#101)

(cherry picked from commit 4192899)

Author: autophagy

src/main/c/pemja/core/pyutils.c

@@ -315,7 +315,7 @@ PyObject* JcpPyObject_FromJObject(JNIEnv* env, jobject value) {
     } else if ((*env)->IsSameObject(env, clazz, JBYTE_OBJ_TYPE)) {
       result = JcpPyInt_FromJByte(env, value);
     } else if ((*env)->IsSameObject(env, clazz, JSHORT_OBJ_TYPE)) {
-      result = JcpPyInt_FromJShort(env, clazz);
+      result = JcpPyInt_FromJShort(env, value);
     } else if ((*env)->IsSameObject(env, clazz, JBIGDECIMAL_TYPE)) {
       result = JcpPyDecimal_FromJBigDecimal(env, value);
     } else if ((*env)->IsSameObject(env, clazz, JBIGINTEGER_TYPE)) {

src/test/java/pemja/core/PythonInterpreterTest.java

@@ -209,6 +209,12 @@ public void testSetAndGet() {
             a1[1] = new int[] {3, 4};
             interpreter.set("a1", a1);
             assertArrayEquals(a1, interpreter.get("a1", int[][].class));
+
+            Object[] b1 = new Object[] {Short.MIN_VALUE, Short.MAX_VALUE};
+            interpreter.set("b1", b1);
+            assertArrayEquals(
+                    new Object[] {(long) Short.MIN_VALUE, (long) Short.MAX_VALUE},
+                    interpreter.get("b1", Object[].class));
         }
     }
 
@@ -340,6 +346,11 @@ public void testCallPythonWithAllTypes() throws Exception {
             arg11.put("pemja", 2L);
             assertEquals(arg11, interpreter.invoke("test_call.test_call_one_arg", arg11));
 
+            assertEquals(
+                    (long) Short.MAX_VALUE,
+                    interpreter.invoke(
+                            "test_call.test_call_variable_args", Short.MAX_VALUE, Short.MIN_VALUE));
+
             PyIterator iterators =
                     (PyIterator) interpreter.invoke("test_call.test_return_generator", 3);
             Object[] expected = new Object[] {0L, 1L, 2L, "haha", null};