infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-03-25 07:09:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

8060715: There is a small race condition in IdleResetSjavac

Browse Source 
Synchronizes on method level instead of variable access level.

Reviewed-by: jfranck
This commit is contained in:
Andreas Lundblad 2014-10-27 14:55:47 +01:00
parent 70e627d95d
commit d3be5ae723
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/IdleResetSjavac.java
View File

@ -30,7 +30,6 @@ import java.util.List;
import java.util.Set;
import java.util.Timer;
import java.util.TimerTask;
import java.util.concurrent.atomic.AtomicInteger;
/**
* An sjavac implementation that keeps track of idleness and shuts down the
@ -47,10 +46,10 @@ import java.util.concurrent.atomic.AtomicInteger;
public class IdleResetSjavac implements Sjavac {
private final Sjavac delegate;
private final AtomicInteger outstandingCalls = new AtomicInteger();
private final Terminable toShutdown;
private final Timer idlenessTimer = new Timer();
private final long idleTimeout;
private int outstandingCalls = 0;
// Class invariant: idlenessTimerTask != null <-> idlenessTimerTask is scheduled
private TimerTask idlenessTimerTask;
@ -94,9 +93,9 @@ public class IdleResetSjavac implements Sjavac {
}
}
private void startCall() {
private synchronized void startCall() {
// Was there no outstanding calls before this call?
if (outstandingCalls.incrementAndGet() == 1) {
if (++outstandingCalls == 1) {
// Then the timer task must have been scheduled
if (idlenessTimerTask == null)
throw new IllegalStateException("Idle timeout already cancelled");
@ -106,8 +105,8 @@ public class IdleResetSjavac implements Sjavac {
}
}
private void endCall() {
if (outstandingCalls.decrementAndGet() == 0) {
private synchronized void endCall() {
if (--outstandingCalls == 0) {
// No more outstanding calls. Schedule timeout.
scheduleTimeout();
}