Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc02f9b5 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "ShellSubscriber: Avoid rollover bug" into rvc-dev am: f1d96d48 am: 2f552669

Change-Id: I52a1726789b8b865876ca2ed341f782f16808453
parents d88abe03 2f552669
Loading
Loading
Loading
Loading
+1 −1
Original line number Original line Diff line number Diff line
@@ -41,7 +41,7 @@ void ShellSubscriber::startNewSubscription(int in, int out, int timeoutSec) {


    // critical-section
    // critical-section
    std::unique_lock<std::mutex> lock(mMutex);
    std::unique_lock<std::mutex> lock(mMutex);
    if (myToken < mToken) {
    if (myToken != mToken) {
        // Some other subscription has already come in. Stop.
        // Some other subscription has already come in. Stop.
        return;
        return;
    }
    }
+1 −1
Original line number Original line Diff line number Diff line
@@ -108,7 +108,7 @@ private:


    std::shared_ptr<SubscriptionInfo> mSubscriptionInfo = nullptr;
    std::shared_ptr<SubscriptionInfo> mSubscriptionInfo = nullptr;


    int mToken;
    int mToken = 0;
};
};


}  // namespace statsd
}  // namespace statsd