Merge pull request #215 from AltBeacon/protect-against-npe

Protect Against NPE in Iteration
AltBeacon · Jul 5, 2015 · fa66ce1 · fa66ce1
2 parents 1c720f3 + 0d276a9
commit fa66ce1
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/src/main/java/org/altbeacon/beacon/service/BeaconService.java b/src/main/java/org/altbeacon/beacon/service/BeaconService.java
@@ -475,12 +475,15 @@ private List<Region> matchingRegions(Beacon beacon, Collection<Region> regions)
             Iterator<Region> regionIterator = regions.iterator();
             while (regionIterator.hasNext()) {
                 Region region = regionIterator.next();
-                if (region.matchesBeacon(beacon)) {
-                    matched.add(region);
-                } else {
-                    LogManager.d(TAG, "This region (%s) does not match beacon: %s", region, beacon);
+                // Need to check if region is null in case it was removed from the collection by
+                // another thread during iteration
+                if (region != null) {
+                    if (region.matchesBeacon(beacon)) {
+                        matched.add(region);
+                    } else {
+                        LogManager.d(TAG, "This region (%s) does not match beacon: %s", region, beacon);
+                    }
                 }
-
             }
 
         return matched;