MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

initialize delegate state inside synchronized block to avoid data race when delegate initialized, stopped and only then registered, missing the stop() call

Browse Source
This commit is contained in:
Alexey Kudravtsev
2019-03-21 14:54:06 +03:00
parent 82f5f222e8
commit 573af80d00
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/core-impl/src/com/intellij/openapi/progress/util/AbstractProgressIndicatorExBase.java
+5 -4
View File
@@ -15,7 +15,6 @@
*/
package com.intellij.openapi.progress.util;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.progress.ProgressIndicator;
import com.intellij.openapi.progress.TaskInfo;
import com.intellij.openapi.wm.ex.ProgressIndicatorEx;
@@ -26,7 +25,6 @@ import org.jetbrains.annotations.NotNull;
import java.util.Collection;
public class AbstractProgressIndicatorExBase extends AbstractProgressIndicatorBase implements ProgressIndicatorEx {
private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.progress.util.ProgressIndicatorBase");
private final boolean myReusable;
private volatile ProgressIndicatorEx[] myStateDelegates;
private volatile WeakList<TaskInfo> myFinished;
@@ -153,15 +151,18 @@ public class AbstractProgressIndicatorExBase extends AbstractProgressIndicatorBa
@Override
public final void addStateDelegate(@NotNull ProgressIndicatorEx delegate) {
delegate.initStateFrom(this);
synchronized (this) {
delegate.initStateFrom(this);
ProgressIndicatorEx[] stateDelegates = myStateDelegates;
if (stateDelegates == null) {
myStateDelegates = stateDelegates = new ProgressIndicatorEx[1];
stateDelegates[0] = delegate;
}
else {
LOG.assertTrue(!ArrayUtil.contains(delegate, stateDelegates), "Already registered: " + delegate);
// hard throw is essential for avoiding deadlocks
if (ArrayUtil.contains(delegate, stateDelegates)) {
throw new IllegalArgumentException("Already registered: " + delegate);
}
myStateDelegates = ArrayUtil.append(stateDelegates, delegate, ProgressIndicatorEx.class);
}
}