Skip to content

Fixed NPE on getting null item of collection. #80

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
merged 1 commit into from
Oct 11, 2013
Merged

Fixed NPE on getting null item of collection. #80

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
2 changes: 1 addition & 1 deletion src/main/java/de/danielbechler/diff/accessor/CollectionItemAccessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public Object get(final Object target)
}
for (final Object item : targetCollection)
{
if (item.equals(referenceItem))
if (item != null && item.equals(referenceItem))
{
return item;
}
Expand Down
6 changes: 6 additions & 0 deletions ...ava/de/danielbechler/diff/integration/DeepDiffingCollectionItemChangeIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,10 @@ public void test_returns_full_property_graph_of_added_collection_items()
.withMapKey("foo")
.withPropertyName("value")).hasState(Node.State.ADDED);
}

@Test
public void test_collection_with_null_item()
{
ObjectDifferFactory.getInstance().compare(Arrays.asList((String)null), Arrays.asList("foobar"));
}
}