From 54762825b0585fd771b4bf198d85c5d67e92bf68 Mon Sep 17 00:00:00 2001
From: Leith Bade <leith@mapbox.com>
Date: Fri, 23 Oct 2015 15:42:39 +1100
Subject: [PATCH] [android] Fix JNI local ref overflow Change test to 1000
 markers For #2726

---
 android/cpp/jni.cpp                                             | 2 +-
 .../java/com/mapbox/mapboxsdk/testapp/BulkMarkerActivity.java   | 2 +-
 platform/default/default_styles.cpp                             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/android/cpp/jni.cpp b/android/cpp/jni.cpp
index e4f1cd26a..d0d3ea297 100644
--- a/android/cpp/jni.cpp
+++ b/android/cpp/jni.cpp
@@ -887,6 +887,7 @@ jlongArray JNICALL nativeAddMarkers(JNIEnv *env, jobject obj, jlong nativeMapVie
         env->DeleteLocalRef(icon);
 
         std::string id = std_string_from_jstring(env, jid);
+        env->DeleteLocalRef(jid);
 
         jdouble latitude = env->GetDoubleField(position, latLngLatitudeId);
         if (env->ExceptionCheck()) {
@@ -2196,4 +2197,3 @@ extern "C" JNIEXPORT void JNICALL JNI_OnUnload(JavaVM *vm, void *reserved) {
     theJVM = nullptr;
 }
 }
-
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/BulkMarkerActivity.java b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/BulkMarkerActivity.java
index 0a0ee60da..5f88ba851 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/BulkMarkerActivity.java
+++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/BulkMarkerActivity.java
@@ -47,7 +47,7 @@ public class BulkMarkerActivity extends AppCompatActivity {
         mMapView.onCreate(savedInstanceState);
         mMapView.setCenterCoordinate(new LatLngZoom(38.87031, -77.00897, 10));
 
-        new LoadBulkMarkerTask(mMapView, 250).execute();
+        new LoadBulkMarkerTask(mMapView, 1000).execute();
     }
 
     @Override
diff --git a/platform/default/default_styles.cpp b/platform/default/default_styles.cpp
index d7199f36b..1a679dbda 100644
--- a/platform/default/default_styles.cpp
+++ b/platform/default/default_styles.cpp
@@ -8,7 +8,7 @@ const std::vector<std::pair<std::string, std::string>> defaultStyles = {
     { "asset://styles/emerald-v8.json", "Emerald" },
     { "asset://styles/light-v8.json", "Light" },
     { "asset://styles/dark-v8.json", "Dark" },
-    { "asset://styles/satellite-v8.json", "Satellite" }
+    { "asset://styles/satellite-v8.json", "Satellite" },
     { "asset://styles/satellite-hyrid-v8.json", "Satellite Streets" }
 };