[android] #3891 - add ExceptionCheck

mapbox · Feb 19, 2016 · 79f918e · 79f918e
1 parent 1d4aa71
commit 79f918e
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/platform/android/src/jni.cpp b/platform/android/src/jni.cpp
@@ -1738,9 +1738,14 @@ void JNICALL createOfflineRegion(JNIEnv *env, jobject obj, jlong defaultFileSour
             jobject jRegion = env->NewObject(offlineRegionClass, offlineRegionConstructorId, region->getID());
             // env->SetLongField(jRegion, offlineRegionIdId, region->getID());
 
-            // This currently causes an exception on Android
-            mbgl::Log::Error(mbgl::Event::JNI, "Triggering Java callback.");
-            env->CallVoidMethod(createCallback, createOnCreateMethodId, jRegion);
+            if (env->ExceptionCheck()) {
+                mbgl::Log::Error(mbgl::Event::JNI, "Exception.");
+                env->ExceptionDescribe();
+            } else {
+                // This currently causes an exception on Android
+                mbgl::Log::Error(mbgl::Event::JNI, "Triggering Java callback.");
+                env->CallVoidMethod(createCallback, createOnCreateMethodId, jRegion);
+            }
         }
 
         // Detach when we're done