Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlain Magloire2005-08-10 19:40:50 +0000
committerAlain Magloire2005-08-10 19:40:50 +0000
commitaed2b9bd6bc101290df7422246e1c3eb7e11e4d5 (patch)
tree7fe039860049437c3cd5980664286eb3a02daf70
parent2b859274b022bf12cf6c2343f14bd161ff42ff36 (diff)
downloadorg.eclipse.cdt-aed2b9bd6bc101290df7422246e1c3eb7e11e4d5.tar.gz
org.eclipse.cdt-aed2b9bd6bc101290df7422246e1c3eb7e11e4d5.tar.xz
org.eclipse.cdt-aed2b9bd6bc101290df7422246e1c3eb7e11e4d5.zip
2005-08-04 Alain Magloire
According to PR 104907, this patch is needed. * browser/org/eclipse/cdt/internal/core/browser/cache/TypeCahcerJob.java
-rw-r--r--core/org.eclipse.cdt.core/ChangeLog4
-rw-r--r--core/org.eclipse.cdt.core/browser/org/eclipse/cdt/internal/core/browser/cache/TypeCacherJob.java13
2 files changed, 12 insertions, 5 deletions
diff --git a/core/org.eclipse.cdt.core/ChangeLog b/core/org.eclipse.cdt.core/ChangeLog
index c485c512a53..50591fb332c 100644
--- a/core/org.eclipse.cdt.core/ChangeLog
+++ b/core/org.eclipse.cdt.core/ChangeLog
@@ -1,4 +1,8 @@
2005-08-04 Alain Magloire
+ According to PR 104907, this patch is needed.
+ * browser/org/eclipse/cdt/internal/core/browser/cache/TypeCahcerJob.java
+
+2005-08-04 Alain Magloire
Fix taken from 3.0 PR 104907
* browser/org/eclipse/cdt/internal/core/browser/cache/TypeCache.java
* browser/org/eclipse/cdt/internal/core/browser/cache/TypeCacheJob.java
diff --git a/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/internal/core/browser/cache/TypeCacherJob.java b/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/internal/core/browser/cache/TypeCacherJob.java
index 863610233ea..48953750622 100644
--- a/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/internal/core/browser/cache/TypeCacherJob.java
+++ b/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/internal/core/browser/cache/TypeCacherJob.java
@@ -119,6 +119,8 @@ public class TypeCacherJob extends BasicJob {
private void flush(ITypeSearchScope scope, IProgressMonitor monitor) throws InterruptedException {
// flush the cache
+ boolean success = true;
+
IProject project = fTypeCache.getProject();
monitor.beginTask("", 100); //$NON-NLS-1$
@@ -126,11 +128,11 @@ public class TypeCacherJob extends BasicJob {
fTypeCache.flush(scope);
if (!scope.encloses(project)) {
if (project.exists() && project.isOpen()) {
- doIndexerJob(new IndexerDependenciesJob(fIndexManager, fTypeCache, scope), monitor);
+ success = doIndexerJob(new IndexerDependenciesJob(fIndexManager, fTypeCache, scope), monitor);
}
}
- if ( monitor.isCanceled() ) {
+ if ( !success || monitor.isCanceled() ) {
throw new InterruptedException();
}
@@ -138,14 +140,15 @@ public class TypeCacherJob extends BasicJob {
}
private void update(ITypeSearchScope scope, IProgressMonitor monitor) throws InterruptedException {
- IProject project = fTypeCache.getProject();
+ boolean success = true;
+ IProject project = fTypeCache.getProject();
monitor.beginTask("", 100); //$NON-NLS-1$
if (project.exists() && project.isOpen()) {
- doIndexerJob(new IndexerTypesJob(fIndexManager, fTypeCache, scope), monitor);
+ success = doIndexerJob(new IndexerTypesJob(fIndexManager, fTypeCache, scope), monitor);
}
- if (monitor.isCanceled()) {
+ if ( !success || monitor.isCanceled() ) {
throw new InterruptedException();
}

Back to the top