1 files changed, 16 insertions, 12 deletions
diff --git a/platform/android/src/geojson/feature_collection.cpp b/platform/android/src/geojson/feature_collection.cpp
index 2f156532ae..18a41d48fa 100644
--- a/platform/android/src/geojson/feature_collection.cpp
+++ b/platform/android/src/geojson/feature_collection.cpp
@@ -7,24 +7,28 @@ namespace android {
 namespace geojson {
 
 mbgl::FeatureCollection FeatureCollection::convert(jni::JNIEnv& env, jni::Object<FeatureCollection> jCollection) {
-    auto jFeatureList = FeatureCollection::getFeatures(env, jCollection);
-    auto jFeatures = java::util::List::toArray<Feature>(env, jFeatureList);
-    auto size = size_t(jFeatures.Length(env));
-
     auto collection = mbgl::FeatureCollection();
-    collection.reserve(size);
 
-    for (size_t i = 0; i < size; i++) {
-        auto jFeature = jFeatures.Get(env, i);
-        collection.push_back(Feature::convert(env, jFeature));
-        jni::DeleteLocalRef(env, jFeature);
-    }
+    if (jCollection) {
+        auto jFeatureList = FeatureCollection::features(env, jCollection);
+        auto jFeatures = java::util::List::toArray<Feature>(env, jFeatureList);
+        auto size = size_t(jFeatures.Length(env));
+        collection.reserve(size);
 
+        for (size_t i = 0; i < size; i++) {
+            auto jFeature = jFeatures.Get(env, i);
+            collection.push_back(Feature::convert(env, jFeature));
+            jni::DeleteLocalRef(env, jFeature);
+        }
+
+        jni::DeleteLocalRef(env, jFeatures);
+        jni::DeleteLocalRef(env, jFeatureList);
+    }
     return collection;
 }
 
-jni::Object<java::util::List> FeatureCollection::getFeatures(jni::JNIEnv& env, jni::Object<FeatureCollection> jCollection) {
-    static auto method = FeatureCollection::javaClass.GetMethod<jni::Object<java::util::List> ()>(env, "getFeatures");
+jni::Object<java::util::List> FeatureCollection::features(jni::JNIEnv& env, jni::Object<FeatureCollection> jCollection) {
+    static auto method = FeatureCollection::javaClass.GetMethod<jni::Object<java::util::List> ()>(env, "features");
     return jCollection.Call(env, method);
 }