diff options
| author | Leith Bade <leith@mapbox.com> | 2015-08-31 15:35:39 +1000 |
|---|---|---|
| committer | Leith Bade <leith@mapbox.com> | 2015-09-02 10:20:11 +1000 |
| commit | f772973847ae339936e22fe722aaafcc0b49d91b (patch) | |
| tree | a12e5cbe1ada55cc473a5d99717e520b56a93794 /android/cpp | |
| parent | 4d5a4d27f1a2e9d2a06ffde44dc2194ff22bec10 (diff) | |
| download | qtlocation-mapboxgl-f772973847ae339936e22fe722aaafcc0b49d91b.tar.gz | |
Tidy up missing JNI deletes
Diffstat (limited to 'android/cpp')
| -rw-r--r-- | android/cpp/jni.cpp | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/android/cpp/jni.cpp b/android/cpp/jni.cpp index e077e318a4..b3e9edd044 100644 --- a/android/cpp/jni.cpp +++ b/android/cpp/jni.cpp @@ -979,7 +979,7 @@ void JNICALL nativeRemoveAnnotations(JNIEnv *env, jobject obj, jlong nativeMapVi jlongArray JNICALL nativeGetAnnotationsInBounds(JNIEnv *env, jobject obj, jlong nativeMapViewPtr, jobject bbox) { mbgl::Log::Debug(mbgl::Event::JNI, "nativeGetAnnotationsInBounds"); - assert(nativeMapViewPtr != 0); + assert(nativeMapViewPtr != 0); NativeMapView *nativeMapView = reinterpret_cast<NativeMapView *>(nativeMapViewPtr); if (env->ExceptionCheck() || (bbox == nullptr)) { @@ -1731,6 +1731,8 @@ extern "C" JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) { bboxClass = reinterpret_cast<jclass>(env->NewGlobalRef(bboxClass)); if (bboxClass == nullptr) { env->ExceptionDescribe(); + env->DeleteGlobalRef(latLngClass); + env->DeleteGlobalRef(latLngZoomClass); env->DeleteGlobalRef(bboxClass); return JNI_ERR; } @@ -1740,6 +1742,7 @@ extern "C" JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) { env->ExceptionDescribe(); env->DeleteGlobalRef(latLngClass); env->DeleteGlobalRef(latLngZoomClass); + env->DeleteGlobalRef(bboxClass); return JNI_ERR; } @@ -1748,6 +1751,7 @@ extern "C" JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) { env->ExceptionDescribe(); env->DeleteGlobalRef(latLngClass); env->DeleteGlobalRef(latLngZoomClass); + env->DeleteGlobalRef(bboxClass); env->DeleteGlobalRef(markerClass); return JNI_ERR; } @@ -1757,6 +1761,7 @@ extern "C" JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) { env->ExceptionDescribe(); env->DeleteGlobalRef(latLngClass); env->DeleteGlobalRef(latLngZoomClass); + env->DeleteGlobalRef(bboxClass); env->DeleteGlobalRef(markerClass); env->DeleteGlobalRef(polylineClass); return JNI_ERR; @@ -1767,6 +1772,7 @@ extern "C" JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) { env->ExceptionDescribe(); env->DeleteGlobalRef(latLngClass); env->DeleteGlobalRef(latLngZoomClass); + env->DeleteGlobalRef(bboxClass); env->DeleteGlobalRef(markerClass); env->DeleteGlobalRef(polylineClass); env->DeleteGlobalRef(polygonClass); @@ -1779,6 +1785,7 @@ extern "C" JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) { env->ExceptionDescribe(); env->DeleteGlobalRef(latLngClass); env->DeleteGlobalRef(latLngZoomClass); + env->DeleteGlobalRef(bboxClass); env->DeleteGlobalRef(markerClass); env->DeleteGlobalRef(polylineClass); env->DeleteGlobalRef(polygonClass); @@ -1791,6 +1798,7 @@ extern "C" JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) { env->ExceptionDescribe(); env->DeleteGlobalRef(latLngClass); env->DeleteGlobalRef(latLngZoomClass); + env->DeleteGlobalRef(bboxClass); env->DeleteGlobalRef(markerClass); env->DeleteGlobalRef(polylineClass); env->DeleteGlobalRef(polygonClass); @@ -1804,6 +1812,7 @@ extern "C" JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) { env->ExceptionDescribe(); env->DeleteGlobalRef(latLngClass); env->DeleteGlobalRef(latLngZoomClass); + env->DeleteGlobalRef(bboxClass); env->DeleteGlobalRef(markerClass); env->DeleteGlobalRef(polylineClass); env->DeleteGlobalRef(polygonClass); @@ -1819,6 +1828,7 @@ extern "C" JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) { env->DeleteGlobalRef(latLngClass); env->DeleteGlobalRef(markerClass); env->DeleteGlobalRef(latLngZoomClass); + env->DeleteGlobalRef(bboxClass); env->DeleteGlobalRef(polylineClass); env->DeleteGlobalRef(polygonClass); env->DeleteGlobalRef(runtimeExceptionClass); @@ -1834,6 +1844,7 @@ extern "C" JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) { env->DeleteGlobalRef(latLngClass); env->DeleteGlobalRef(markerClass); env->DeleteGlobalRef(latLngZoomClass); + env->DeleteGlobalRef(bboxClass); env->DeleteGlobalRef(polylineClass); env->DeleteGlobalRef(polygonClass); env->DeleteGlobalRef(runtimeExceptionClass); @@ -1849,6 +1860,7 @@ extern "C" JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) { env->DeleteGlobalRef(latLngClass); env->DeleteGlobalRef(markerClass); env->DeleteGlobalRef(latLngZoomClass); + env->DeleteGlobalRef(bboxClass); env->DeleteGlobalRef(polylineClass); env->DeleteGlobalRef(polygonClass); env->DeleteGlobalRef(runtimeExceptionClass); |