From 1972c2b70a852e85d38063069f5a1d229a6219ca Mon Sep 17 00:00:00 2001 From: Alain Magloire Date: Sat, 19 Jun 2004 02:47:35 +0000 Subject: [PATCH] 2004-06-18 Alain Magloire - The call CCorePlugin.getCDescriptor(..) seems to return null. This should be fix but meanwhile give the indexer a break by catching it. --- core/org.eclipse.cdt.core/index/ChangeLog | 4 ++++ .../core/search/indexing/IndexManager.java | 14 ++++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/core/org.eclipse.cdt.core/index/ChangeLog b/core/org.eclipse.cdt.core/index/ChangeLog index 6813ea9510a..3bfa4e597ae 100644 --- a/core/org.eclipse.cdt.core/index/ChangeLog +++ b/core/org.eclipse.cdt.core/index/ChangeLog @@ -1,3 +1,7 @@ +2004-06-18 Alain Magloire + - The call CCorePlugin.getCDescriptor(..) seems to return null. + This should be fix but meanwhile give the indexer a break by catching it. + 2004-06-18 Andrew Niefer - call InderManager.jobFinishedNotification( this ) from IndexRequest.cancel() so that the IndexManager's jobSet doesn't become stale. diff --git a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/search/indexing/IndexManager.java b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/search/indexing/IndexManager.java index 9be4b7e62ee..c3851bf5027 100644 --- a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/search/indexing/IndexManager.java +++ b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/search/indexing/IndexManager.java @@ -756,16 +756,18 @@ public class IndexManager extends JobManager implements IIndexConstants { private Boolean loadIndexerEnabledFromCDescriptor(IProject project) throws CoreException { ICDescriptor descriptor = CCorePlugin.getDefault().getCProjectDescription(project, true ); - - Node child = descriptor.getProjectData(CDT_INDEXER).getFirstChild(); + // FIXME: descriptor should not be null ... but ... lets catch here for now. Boolean strBool = null; + if (descriptor != null) { + Node child = descriptor.getProjectData(CDT_INDEXER).getFirstChild(); - while (child != null) { - if (child.getNodeName().equals(INDEXER_ENABLED)) - strBool = Boolean.valueOf(((Element)child).getAttribute(INDEXER_VALUE)); + while (child != null) { + if (child.getNodeName().equals(INDEXER_ENABLED)) + strBool = Boolean.valueOf(((Element)child).getAttribute(INDEXER_VALUE)); - child = child.getNextSibling(); + child = child.getNextSibling(); + } } return strBool;