r2507: remove marker: Attempt to invoke virtual method 'void com.google.android.gms.maps.model.setIcon(com.google.android.gms.maps.model.BitmapDescription)' on a null object reference #: remove marker: Attempt to invoke virtual method 'void com.google.android.gms.maps.model.setIcon(com.google.android.gms.maps.model.BitmapDescription)' on a null object reference (#2555)

salah-ghanim · rborn · commit b870c0bcf18b · 2018-10-22T15:00:58.000+02:00
* null check is enough
diff --git a/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapMarker.java b/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapMarker.java
@@ -285,8 +285,9 @@ public void updateMarkerIcon() {
       // No more updates for this, as it's a simple icon
       hasViewChanges = false;
     }
-
-    marker.setIcon(getIcon());
+    if (marker != null) {
+      marker.setIcon(getIcon());
+    }
   }
 
   public LatLng interpolate(float fraction, LatLng a, LatLng b) {

Original file line number	Diff line number	Diff line change
`@@ -285,8 +285,9 @@ public void updateMarkerIcon() {`
`285`	`285`	`// No more updates for this, as it's a simple icon`
`286`	`286`	`hasViewChanges = false;`
`287`	`287`	`}`
`288`		`-`
`289`		`- marker.setIcon(getIcon());`
	`288`	`+ if (marker != null) {`
	`289`	`+ marker.setIcon(getIcon());`
	`290`	`+ }`
`290`	`291`	`}`
`291`	`292`
`292`	`293`	`public LatLng interpolate(float fraction, LatLng a, LatLng b) {`