From cfa105d23c11c85cfa7dbf6f5657cfb31d0c9812 Mon Sep 17 00:00:00 2001 From: Chris Recoskie Date: Mon, 20 Apr 2009 20:41:09 +0000 Subject: [PATCH] RESOLVED - bug 272979: reference to CCorePlugin.log(Throwable) in AbstractIndexerTask.runTask() breaks standalone indexing https://bugs.eclipse.org/bugs/show_bug.cgi?id=272979 --- .../cdt/internal/core/indexer/StandaloneIndexerTask.java | 8 ++++++++ .../cdt/internal/core/pdom/AbstractIndexerTask.java | 6 +++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/indexer/StandaloneIndexerTask.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/indexer/StandaloneIndexerTask.java index d815821918b..b8bb9082a5c 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/indexer/StandaloneIndexerTask.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/indexer/StandaloneIndexerTask.java @@ -234,6 +234,14 @@ public abstract class StandaloneIndexerTask extends AbstractIndexerTask { protected void logError(IStatus s) { getLogService().traceLog(s.getMessage()); } + + /* (non-Javadoc) + * @see org.eclipse.cdt.internal.core.pdom.AbstractIndexerTask#logException(java.lang.Throwable) + */ + @Override + protected void logException(Throwable e) { + getLogService().traceLog(e.getMessage()); + } @SuppressWarnings("deprecation") @Override diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/AbstractIndexerTask.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/AbstractIndexerTask.java index ed658c758fa..e37ae3b79bd 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/AbstractIndexerTask.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/AbstractIndexerTask.java @@ -317,7 +317,7 @@ public abstract class AbstractIndexerTask extends PDOMWriter { fIndex.flush(); } } catch (CoreException e) { - CCorePlugin.log(e); + logException(e); } finally { fIndex.releaseReadLock(); } @@ -804,6 +804,10 @@ public abstract class AbstractIndexerTask extends PDOMWriter { protected void logError(IStatus s) { CCorePlugin.log(s); } + + protected void logException(Throwable e) { + CCorePlugin.log(e); + } private static int computeHashCode(IScannerInfo scannerInfo) { int result= 0;