refs qorelanguage/qore#3026 fixed QoreObject.className()

qorelanguage · Oct 14, 2018 · 094e641 · 094e641
1 parent 9396657
commit 094e641
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/src/Globals.cpp b/src/Globals.cpp
@@ -292,8 +292,7 @@ static jstring JNICALL qore_object_class_name(JNIEnv*, jclass, jlong ptr) {
     QoreObject* obj = reinterpret_cast<QoreObject*>(ptr);
 
     Env env;
-    ModifiedUtf8String str(obj->getClassName());
-    return env.newString(str.c_str()).release();
+    return env.newString(obj->getClassName()).release();
 }
 
 static jboolean JNICALL qore_object_instance_of(JNIEnv*, jclass, jlong ptr, jstring cname) {

diff --git a/src/java/org/qore/jni/QoreObject.java b/src/java/org/qore/jni/QoreObject.java
@@ -78,11 +78,11 @@ private long releasePointer() {
         return x;
     }
 
-    private native String className0(long obj);
-    private native boolean instanceOf0(long obj, String class_name);
-    private native Object callMethod0(long obj, String name);
-    private native Object callMethod0(long obj, String name, Object... args);
-    private native Object getMemberValue0(long obj, String name);
+    private native String className0(long ptr);
+    private native boolean instanceOf0(long ptr, String class_name);
+    private native Object callMethod0(long ptr, String name);
+    private native Object callMethod0(long ptr, String name, Object... args);
+    private native Object getMemberValue0(long ptr, String name);
     private native void release0(long ptr);
     private native void destroy0(long ptr);
     private native void finalize0(long ptr);

diff --git a/test/java/src/org/qore/jni/test/QoreJavaApiTest.java b/test/java/src/org/qore/jni/test/QoreJavaApiTest.java
@@ -120,4 +120,8 @@ static HashMap[] testObject10(QoreObject obj) throws Throwable {
             obj.release();
         }
     }
+
+    static String testObject11(QoreObject obj) {
+        return obj.className();
+    }
 }
diff --git a/test/jni.qtest b/test/jni.qtest
@@ -137,10 +137,11 @@ public class Main inherits QUnit::Test {
 
     objectTest() {
         TestClass t();
+        assertEq(True, QoreJavaApiTest::testObject4(t, "TestClass"));
         assertEq("test-x", QoreJavaApiTest::testObject1(t, "test"));
         assertEq("mem", QoreJavaApiTest::testObject2(t));
         assertEq(t, QoreJavaApiTest::testObject3(t));
-        assertEq(True, QoreJavaApiTest::testObject4(t, "TestClass"));
+        assertEq("TestClass", QoreJavaApiTest::testObject11(t));
     }
 
     dateTest() {