Bug 569186: Fix: Project rebuild is causing Unresolved inclusion issues
Change-Id: I9c59c6a8b5963edac7d33a35b936a161ce9eb337
Signed-off-by: Martin Weber <fifteenknots505@gmail.com>
diff --git a/cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/CMakeBuildConfiguration.java b/cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/CMakeBuildConfiguration.java
index 66453b8..4cf4b2f 100644
--- a/cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/CMakeBuildConfiguration.java
+++ b/cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/CMakeBuildConfiguration.java
@@ -131,7 +131,6 @@
IProject project = getProject();
project.deleteMarkers(ICModelMarker.C_MODEL_PROBLEM_MARKER, false, IResource.DEPTH_INFINITE);
- infoPerResource = new HashMap<>();
try {
@@ -357,14 +356,13 @@
public IScannerInfo getScannerInformation(IResource resource) {
if (infoPerResource == null) {
// no build was run yet, nothing detected
- infoPerResource = new HashMap<>();
try {
processCompileCommandsFile(null, new NullProgressMonitor());
} catch (CoreException e) {
Activator.log(e);
}
}
- return infoPerResource.get(resource);
+ return infoPerResource == null ? null : infoPerResource.get(resource);
}
private void setScannerInformation(Map<IResource, IScannerInfo> infoPerResource) {
