Skip to main content
summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorBogdan Gheorghe2004-03-31 14:41:59 -0500
committerBogdan Gheorghe2004-03-31 14:41:59 -0500
commitaffd1175f197641466befeb82ce1d3f03b290370 (patch)
tree813ee58f511daf1e0846b5e1200542f03e5ff948 /core
parente635fb93e7c3fe4f605acd975b29fa24c1019c20 (diff)
downloadorg.eclipse.cdt-affd1175f197641466befeb82ce1d3f03b290370.tar.gz
org.eclipse.cdt-affd1175f197641466befeb82ce1d3f03b290370.tar.xz
org.eclipse.cdt-affd1175f197641466befeb82ce1d3f03b290370.zip
Fix for 56943 - CDT hang on Autobuild, added missing index marker icon
Diffstat (limited to 'core')
-rw-r--r--core/org.eclipse.cdt.core/index/ChangeLog3
-rw-r--r--core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/search/indexing/SourceIndexerRequestor.java4
-rw-r--r--core/org.eclipse.cdt.ui/icons/full/obj16/unknown_obj.gifbin0 -> 159 bytes
3 files changed, 7 insertions, 0 deletions
diff --git a/core/org.eclipse.cdt.core/index/ChangeLog b/core/org.eclipse.cdt.core/index/ChangeLog
index 0b155241b4..46c474678d 100644
--- a/core/org.eclipse.cdt.core/index/ChangeLog
+++ b/core/org.eclipse.cdt.core/index/ChangeLog
@@ -1,4 +1,7 @@
2004-03-31 Bogdan Gheorghe
+ Added a check to SourceIndexRequestor.removeMarkers to prevent hang.
+
+2004-03-31 Bogdan Gheorghe
Modified SourceIndexer and SourceIndexerRequestor to place IProblem markers
on resources.
diff --git a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/search/indexing/SourceIndexerRequestor.java b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/search/indexing/SourceIndexerRequestor.java
index b490bf3008..59cf5d1099 100644
--- a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/search/indexing/SourceIndexerRequestor.java
+++ b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/search/indexing/SourceIndexerRequestor.java
@@ -538,7 +538,11 @@ public class SourceIndexerRequestor implements ISourceElementRequestor, IIndexCo
public void removeMarkers(IFile resource) {
int depth = IResource.DEPTH_INFINITE;
try {
+ IMarker[] markers = resource.findMarkers(ICModelMarker.INDEXER_MARKER,true,depth);
+ if (markers.length > 0){
resource.deleteMarkers(ICModelMarker.INDEXER_MARKER, true, depth);
+ }
+
} catch (CoreException e) {
// something went wrong
}
diff --git a/core/org.eclipse.cdt.ui/icons/full/obj16/unknown_obj.gif b/core/org.eclipse.cdt.ui/icons/full/obj16/unknown_obj.gif
new file mode 100644
index 0000000000..c0058f761e
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/full/obj16/unknown_obj.gif
Binary files differ

Back to the top