From affd1175f197641466befeb82ce1d3f03b290370 Mon Sep 17 00:00:00 2001 From: Bogdan Gheorghe Date: Wed, 31 Mar 2004 19:41:59 +0000 Subject: [PATCH] Fix for 56943 - CDT hang on Autobuild, added missing index marker icon --- core/org.eclipse.cdt.core/index/ChangeLog | 3 +++ .../search/indexing/SourceIndexerRequestor.java | 4 ++++ .../icons/full/obj16/unknown_obj.gif | Bin 0 -> 159 bytes 3 files changed, 7 insertions(+) create mode 100644 core/org.eclipse.cdt.ui/icons/full/obj16/unknown_obj.gif diff --git a/core/org.eclipse.cdt.core/index/ChangeLog b/core/org.eclipse.cdt.core/index/ChangeLog index 0b155241b46..46c474678db 100644 --- a/core/org.eclipse.cdt.core/index/ChangeLog +++ b/core/org.eclipse.cdt.core/index/ChangeLog @@ -1,3 +1,6 @@ +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 b490bf3008b..59cf5d1099d 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 0000000000000000000000000000000000000000..c0058f761e70ce5e2ab7cef06afd9001d418c11e GIT binary patch literal 159 zcmZ?wbhEHb6krfw*v!CSZy$gE{{H{}{~tJTVE_L84Gj(P@$n1{3_uYei3t>cvM@3* za4_hAq(Ejcu=og^^n9&j@j59(FhPRtuIjuc?3367Se&xBj)lw2*Qq^J$gw>pQ(Z}t rW20gdyOl(O=he(5DVG>RG&w#*hc3T)I>ARzoA<>QsoczPB?fB%9C9%t literal 0 HcmV?d00001