Skip to content
This repository has been archived by the owner on Jan 24, 2024. It is now read-only.

fix deadlock #182

Merged
merged 1 commit into from
Sep 23, 2020
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
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
public abstract class TimerTask implements Runnable {

protected final long delayMs;
private TimerTaskEntry timerTaskEntry = null;
private volatile TimerTaskEntry timerTaskEntry = null;

protected TimerTask(long delayMs) {
this.delayMs = delayMs;
Expand All @@ -34,16 +34,19 @@ public synchronized void cancel() {
}
}

synchronized void setTimerTaskEntry(TimerTaskEntry entry) {
// if this timerTask is already held by an existing timer task entry,
// we will remove such an entry first.
if (null != timerTaskEntry && timerTaskEntry != entry) {
timerTaskEntry.remove();
void setTimerTaskEntry(TimerTaskEntry entry) {
synchronized (this) {
// if this timerTask is already held by an existing timer task entry,
// we will remove such an entry first.
if (null != timerTaskEntry && timerTaskEntry != entry) {
timerTaskEntry.remove();
}
timerTaskEntry = entry;
}
timerTaskEntry = entry;

}

synchronized TimerTaskEntry getTimerTaskEntry() {
TimerTaskEntry getTimerTaskEntry() {
return timerTaskEntry;
}

Expand Down