Fix {Get,Release}ArrayElements

Author: jfirebaugh

include/jni/functions.hpp

@@ -429,13 +429,13 @@ namespace jni
     std::tuple<UniqueArrayElements<E>, jboolean> GetArrayElements(JNIEnv& env, jarray<E>& array)
        {
         ::jboolean isCopy = JNI_FALSE;
-        const E** result = CheckJavaException(env,
+        E* result = CheckJavaException(env,
             (env.*(TypedMethods<E>::GetArrayElements))(Unwrap(array), &isCopy));
         return std::make_tuple(UniqueArrayElements<E>(result, ArrayElementsDeleter<E>(env, array)), Wrap<jboolean>(isCopy));
        }
 
     template < class E >
-    void ReleaseArrayElements(JNIEnv& env, jarray<E>& array, E** elems)
+    void ReleaseArrayElements(JNIEnv& env, jarray<E>& array, E* elems)
        {
         (env.*(TypedMethods<E>::ReleaseArrayElements))(Unwrap(array), elems, JNI_COMMIT);
         CheckJavaException(env);

include/jni/ownership.hpp

@@ -135,7 +135,7 @@ namespace jni
             ArrayElementsDeleter() = default;
             ArrayElementsDeleter(JNIEnv& e, jarray<E>& a) : env(&e), array(&a) {}
 
-            void operator()(E** p) const
+            void operator()(E* p) const
                {
                 if (p)
                    {
@@ -147,7 +147,7 @@ namespace jni
        };
 
     template < class E >
-    using UniqueArrayElements = std::unique_ptr< E*, ArrayElementsDeleter<E> >;
+    using UniqueArrayElements = std::unique_ptr< E, ArrayElementsDeleter<E> >;
 
 
     template < class E >

test/low_level.cpp

@@ -115,6 +115,25 @@ static void TestGetArrayLength()
     assert(Throws<jni::PendingJavaException>([] { jni::GetArrayLength(env, failureValue.Ref()); }));
    }
 
+static void TestArrayElements()
+   {
+    static Testable<jni::jarray<jni::jboolean>> arrayValue;
+    static TestEnv env;
+
+    env.functions->GetBooleanArrayElements = [] (JNIEnv*, jbooleanArray, jboolean*) -> jboolean*
+       {
+        return nullptr;
+       };
+
+    env.functions->ReleaseBooleanArrayElements = [] (JNIEnv*, jbooleanArray, jboolean*, jint)
+       {
+       };
+
+    auto result = jni::GetArrayElements<jni::jboolean>(env, arrayValue.Ref());
+    jni::ReleaseArrayElements<jni::jboolean>(env, arrayValue.Ref(), std::get<0>(result).get());
+    jni::ReleaseArrayElements<jni::jboolean>(env, arrayValue.Ref(), std::move(std::get<0>(result)));
+   }
+
 static void TestArrayRegion()
    {
     static Testable<jni::jarray<jni::jboolean>> arrayValue;
@@ -261,12 +280,9 @@ int main()
     NewArray
     jobject     (*GetObjectArrayElement)(JNIEnv*, jobjectArray, jsize);
     void        (*SetObjectArrayElement)(JNIEnv*, jobjectArray, jsize, jobject);
-
-    jboolean*   (*GetArrayElements)(JNIEnv*, jbooleanArray, jboolean*);
-    void        (*ReleaseArrayElements)(JNIEnv*, jbooleanArray,
-                        jboolean*, jint);
     */
 
+    TestArrayElements();
     TestArrayRegion();
 
     TestMakeNativeMethod();