mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-07-19 06:55:23 +02:00
Bug 267801 - Open Declaration hangs in deadlock
This commit is contained in:
parent
2e65ed8af0
commit
2e6ebd77d4
1 changed files with 4 additions and 4 deletions
|
@ -1,5 +1,5 @@
|
|||
/*******************************************************************************
|
||||
* Copyright (c) 2005, 2008 IBM Corporation and others.
|
||||
* Copyright (c) 2005, 2009 IBM Corporation and others.
|
||||
* All rights reserved. This program and the accompanying materials
|
||||
* are made available under the terms of the Eclipse Public License v1.0
|
||||
* which accompanies this distribution, and is available at
|
||||
|
@ -97,14 +97,15 @@ public class CReconcilingStrategy implements IReconcilingStrategy, IReconcilingS
|
|||
index= ast.getIndex();
|
||||
}
|
||||
try {
|
||||
if (ast == null || fProgressMonitor.isCanceled()) {
|
||||
final boolean canceled = fProgressMonitor.isCanceled();
|
||||
if (ast == null || canceled) {
|
||||
((ICReconcilingListener)fEditor).reconciled(null, forced, fProgressMonitor);
|
||||
} else {
|
||||
synchronized (ast) {
|
||||
((ICReconcilingListener)fEditor).reconciled(ast, forced, fProgressMonitor);
|
||||
}
|
||||
}
|
||||
if (fProgressMonitor.isCanceled()) {
|
||||
if (canceled) {
|
||||
aboutToBeReconciled();
|
||||
}
|
||||
} catch(Exception e) {
|
||||
|
@ -114,7 +115,6 @@ public class CReconcilingStrategy implements IReconcilingStrategy, IReconcilingS
|
|||
if (index != null) {
|
||||
index.releaseReadLock();
|
||||
}
|
||||
fProgressMonitor.setCanceled(false);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue