Skip to content

Fix #308 - Add null check for removing item from uninitialized QuadTree #314

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stephenmcd merged 1 commit into from
Oct 3, 2016
Merged

Fix #308 - Add null check for removing item from uninitialized QuadTree #314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion library/src/com/google/maps/android/quadtree/PointQuadTree.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,11 @@ private boolean remove(double x, double y, T item) {
}
}
else {
return mItems.remove(item);
if (mItems == null) {
return false;
} else {
return mItems.remove(item);
}
}
}

Expand Down
19 changes: 16 additions & 3 deletions library/tests/src/com/google/maps/android/quadtree/PointQuadTreeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,13 @@ public void testEmpty() {
}

public void testMultiplePoints() {
boolean response;
Item item1 = new Item(0, 0);

// Remove item that isn't yet in the QuadTree
response = mTree.remove(item1);
assertFalse(response);

mTree.add(item1);
Item item2 = new Item(.1, .1);
mTree.add(item2);
Expand All @@ -59,11 +65,18 @@ public void testMultiplePoints() {
assertTrue(items.contains(item2));
assertTrue(items.contains(item3));

mTree.remove(item1);
mTree.remove(item2);
mTree.remove(item3);
response = mTree.remove(item1);
assertTrue(response);
response = mTree.remove(item2);
assertTrue(response);
response = mTree.remove(item3);
assertTrue(response);

assertEquals(0, searchAll().size());

// Remove item that is no longer in the QuadTree
response = mTree.remove(item1);
assertFalse(response);
}

public void testSameLocationDifferentPoint() {
Expand Down