Skip to content
Merged
Changes from all commits
Commits
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
27 changes: 14 additions & 13 deletions common/main/java/com/couchbase/lite/AbstractReplicator.java
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
import java.util.List;
import java.util.Set;
import java.util.concurrent.Executor;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;

import com.couchbase.lite.internal.CouchbaseLiteInternal;
Expand Down Expand Up @@ -178,18 +177,20 @@ public void start(boolean resetCheckpoint) {

getDatabase().addActiveReplicator(this);

getDatabase().registerProcess(new AbstractDatabase.ActiveProcess<ConflictResolverService>(conflictResolverService) {
@Override
public void stop() {
conflictResolverService.shutdown(false, () -> {});
}

@Override
public boolean isActive() {
// Service is active if it's not in STOPPED state
return conflictResolverService.isActive();
}
});
getDatabase().registerProcess(
new AbstractDatabase.ActiveProcess<ConflictResolverService>(conflictResolverService) {
@Override
public void stop() {
conflictResolverService.shutdown(false, () -> {
});
}

@Override
public boolean isActive() {
// Service is active if it's not in STOPPED state
return conflictResolverService.isActive();
}
});

final C4Replicator c4Repl;
try { c4Repl = getOrCreateC4Replicator(); }
Expand Down