MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-08-26 15:27:45 +07:00
Code Issues Packages Projects Releases Wiki Activity

deadlock fix

Browse Source
This commit is contained in:
Maxim Shafirov
2009-09-22 16:48:44 +04:00
parent 5f9634a1f6
commit 31a203ff28
1 changed files with 39 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/psi/impl/compiled/ClsFileImpl.java
+39 -23
View File
@@ -33,6 +33,7 @@ import com.intellij.util.ArrayUtil;
import com.intellij.util.IncorrectOperationException;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.lang.ref.SoftReference;
import java.util.List;
@@ -355,33 +356,48 @@ public class ClsFileImpl extends ClsRepositoryPsiElement<PsiClassHolderFileStub>
@NotNull
public StubTree getStubTree() {
SoftReference<StubTree> stub = myStub;
StubTree stubHolder = stub == null ? null : stub.get();
ApplicationManager.getApplication().assertReadAccessAllowed();
final StubTree derefd = derefStub();
if (derefd != null) return derefd;
StubTree stubHolder = StubTree.readOrBuild(getProject(), getVirtualFile());
if (stubHolder == null) {
synchronized (lock) {
stub = myStub;
stubHolder = stub == null ? null : stub.get();
if (stubHolder != null) {
return stubHolder;
}
stubHolder = StubTree.readOrBuild(getProject(), getVirtualFile());
if (stubHolder == null) {
// Must be corrupted classfile
LOG.info("Class file is corrupted: " + getVirtualFile().getPresentableUrl());
// Must be corrupted classfile
LOG.info("Class file is corrupted: " + getVirtualFile().getPresentableUrl());
stubHolder = new StubTree(new PsiJavaFileStubImpl("corrupted.classfiles", true));
}
myStub = new SoftReference<StubTree>(stubHolder);
((PsiFileStubImpl)stubHolder.getRoot()).setPsi(this);
synchronized (MIRROR_LOCK) {
myMirrorFileElement = null;
}
myPackageStatement = new ClsPackageStatementImpl(this);
StubTree emptyTree = new StubTree(new PsiJavaFileStubImpl("corrupted.classfiles", true));
setStubTree(emptyTree);
return emptyTree;
}
synchronized (lock) {
final StubTree derefdOnLock = derefStub();
if (derefdOnLock != null) return derefdOnLock;
setStubTree(stubHolder);
return stubHolder;
}
}
private void setStubTree(StubTree tree) {
synchronized (lock) {
myStub = new SoftReference<StubTree>(tree);
((PsiFileStubImpl)tree.getRoot()).setPsi(this);
synchronized (MIRROR_LOCK) {
myMirrorFileElement = null;
}
myPackageStatement = new ClsPackageStatementImpl(this);
}
}
@Nullable
private StubTree derefStub() {
synchronized (lock) {
return myStub != null ? myStub.get() : null;
}
return stubHolder;
}
public ASTNode findTreeForStub(final StubTree tree, final StubElement<?> stub) {