-
Notifications
You must be signed in to change notification settings - Fork 205
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.
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
Prevent ConcurrentModificationException in Before notify/breadcrumb callbacks #266
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
f9471d2
add failing test for before notify modification
fractalwrench d693c07
add failing tests for breadcrumb concurrent modification
fractalwrench 1bd636c
update configuration to use concurrentlinkedqueue for holding callbacks
fractalwrench 8ddfa14
update test to use more realistic scenario of adding callbacks
fractalwrench File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
74 changes: 74 additions & 0 deletions
74
sdk/src/androidTest/java/com/bugsnag/android/ConcurrentCallbackTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,74 @@ | ||
package com.bugsnag.android; | ||
|
||
import android.support.annotation.NonNull; | ||
import android.support.test.filters.SmallTest; | ||
import android.support.test.runner.AndroidJUnit4; | ||
|
||
import org.junit.Before; | ||
import org.junit.Test; | ||
import org.junit.runner.RunWith; | ||
|
||
import java.util.Collection; | ||
|
||
/** | ||
* Ensures that if a callback is added or removed during iteration, a | ||
* {@link java.util.ConcurrentModificationException} is not thrown | ||
*/ | ||
@RunWith(AndroidJUnit4.class) | ||
@SmallTest | ||
public class ConcurrentCallbackTest { | ||
|
||
private Client client; | ||
|
||
@Before | ||
public void setUp() throws Exception { | ||
client = BugsnagTestUtils.generateClient(); | ||
} | ||
|
||
@Test | ||
public void testClientNotifyModification() throws Exception { | ||
final Collection<BeforeNotify> beforeNotifyTasks = client.config.getBeforeNotifyTasks(); | ||
client.beforeNotify(new BeforeNotify() { | ||
@Override | ||
public boolean run(Error error) { | ||
beforeNotifyTasks.add(new BeforeNotifySkeleton()); | ||
// modify the Set, when iterating to the next callback this should not crash | ||
return true; | ||
} | ||
}); | ||
client.beforeNotify(new BeforeNotifySkeleton()); | ||
client.notify(new RuntimeException()); | ||
} | ||
|
||
@Test | ||
public void testClientBreadcrumbModification() throws Exception { | ||
final Collection<BeforeRecordBreadcrumb> breadcrumbTasks = client.config.getBeforeRecordBreadcrumbTasks(); | ||
|
||
client.beforeRecordBreadcrumb(new BeforeRecordBreadcrumb() { | ||
@Override | ||
public boolean shouldRecord(@NonNull Breadcrumb breadcrumb) { | ||
breadcrumbTasks.add(new BeforeRecordBreadcrumbSkeleton()); | ||
// modify the Set, when iterating to the next callback this should not crash | ||
return true; | ||
} | ||
}); | ||
client.beforeRecordBreadcrumb(new BeforeRecordBreadcrumbSkeleton()); | ||
client.leaveBreadcrumb("Whoops"); | ||
client.notify(new RuntimeException()); | ||
} | ||
|
||
static class BeforeNotifySkeleton implements BeforeNotify { | ||
@Override | ||
public boolean run(Error error) { | ||
return true; | ||
} | ||
} | ||
|
||
static class BeforeRecordBreadcrumbSkeleton implements BeforeRecordBreadcrumb { | ||
@Override | ||
public boolean shouldRecord(@NonNull Breadcrumb breadcrumb) { | ||
return true; | ||
} | ||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This test fails without the change?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, as it would modify the contents of the
LinkedHashSet
when an iterator has already been implicitly created inrunBeforeNotifyTasks