Skip to content
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

CBL-5035 : Fix missing pending conflict array initialization. #3200

Merged
merged 1 commit into from
Nov 11, 2023

Conversation

pasin
Copy link
Contributor

@pasin pasin commented Nov 11, 2023

  • Fix bad bug of missing the array initialization.

  • Added additional check to ensure that there are no more conflicts scheduled after the replicator is stopped. This is not expected to happen as LiteCore will not be stopped event before sending the doc ended notification but to be sure.

* Fix bad bug from mistakenly deleting the code after cleaning up debug logic.

* Added additional check to ensure that there are no more conflicts scheduled after the replicator is stopped. I don’t think it would happen as LiteCore will not be stopped event before sending the doc ended notification but to be sure.
Copy link
Contributor

@bmeike bmeike left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok... who reviewed that last PR.
I want their head on a pike.
....oh... wait... It was me. ;-P

@@ -104,6 +104,7 @@ - (instancetype) initWithConfig: (CBLReplicatorConfiguration *)config {
_progressLevel = kCBLProgressLevelOverall;
_changeNotifier = [CBLChangeNotifier new];
_docReplicationNotifier = [CBLChangeNotifier new];
_pendingConflicts = [NSMutableArray array];
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh my....

@velicuvlad
Copy link
Contributor

I did not get it either... how was the test passing?

@pasin
Copy link
Contributor Author

pasin commented Nov 11, 2023

The tests failed on Jenkins.

@pasin pasin requested a review from bmeike November 11, 2023 00:27
@pasin pasin merged commit 0f33a19 into release/lithium Nov 11, 2023
3 checks passed
@pasin pasin deleted the CBSE-15077-2 branch November 11, 2023 00:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants