mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-06-08 18:26:01 +02:00
RESOLVED - bug 272979: reference to CCorePlugin.log(Throwable) in AbstractIndexerTask.runTask() breaks standalone indexing
https://bugs.eclipse.org/bugs/show_bug.cgi?id=272979
This commit is contained in:
parent
0a80b06634
commit
cfa105d23c
2 changed files with 13 additions and 1 deletions
|
@ -235,6 +235,14 @@ public abstract class StandaloneIndexerTask extends AbstractIndexerTask {
|
||||||
getLogService().traceLog(s.getMessage());
|
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")
|
@SuppressWarnings("deprecation")
|
||||||
@Override
|
@Override
|
||||||
protected IScannerInfo createDefaultScannerConfig(int linkageID) {
|
protected IScannerInfo createDefaultScannerConfig(int linkageID) {
|
||||||
|
|
|
@ -317,7 +317,7 @@ public abstract class AbstractIndexerTask extends PDOMWriter {
|
||||||
fIndex.flush();
|
fIndex.flush();
|
||||||
}
|
}
|
||||||
} catch (CoreException e) {
|
} catch (CoreException e) {
|
||||||
CCorePlugin.log(e);
|
logException(e);
|
||||||
} finally {
|
} finally {
|
||||||
fIndex.releaseReadLock();
|
fIndex.releaseReadLock();
|
||||||
}
|
}
|
||||||
|
@ -805,6 +805,10 @@ public abstract class AbstractIndexerTask extends PDOMWriter {
|
||||||
CCorePlugin.log(s);
|
CCorePlugin.log(s);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected void logException(Throwable e) {
|
||||||
|
CCorePlugin.log(e);
|
||||||
|
}
|
||||||
|
|
||||||
private static int computeHashCode(IScannerInfo scannerInfo) {
|
private static int computeHashCode(IScannerInfo scannerInfo) {
|
||||||
int result= 0;
|
int result= 0;
|
||||||
Map<String, String> macros= scannerInfo.getDefinedSymbols();
|
Map<String, String> macros= scannerInfo.getDefinedSymbols();
|
||||||
|
|
Loading…
Add table
Reference in a new issue