Commit c1e0a7e4 authored by Nick Alexander's avatar Nick Alexander
Browse files

Bug 722575 - make SerialRecordConsumer.consumerIsDone() thread-safe. r=rnewman

parent 77101d48

mobile/android/base/sync/synchronizer/SerialRecordConsumer.java

+3 −2
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ import android.util.Log; 
class SerialRecordConsumer extends RecordConsumer {

  private static final String LOG_TAG = "SerialRecordConsumer";

  protected boolean stopEventually = false;

  private long counter = 0;

  private volatile long counter = 0;



  public SerialRecordConsumer(RecordsConsumerDelegate delegate) {

    this.delegate = delegate;
@@ -130,7 +130,8 @@ class SerialRecordConsumer extends RecordConsumer { 
  }



  private void consumerIsDone() {

    info("Consumer is done. Processed " + counter + ((counter == 1) ? " record." : " records."));

    long counterNow = this.counter;

    info("Consumer is done. Processed " + counterNow + ((counterNow == 1) ? " record." : " records."));

    delegate.consumerIsDone(stopImmediately);

  }