From b1ad4e2fb07848987b4e9fa25964cded69f12250 Mon Sep 17 00:00:00 2001 From: Doug Schaefer Date: Mon, 31 May 2010 20:41:13 +0000 Subject: [PATCH] Bug 314015 Test fix for scanner discovery. --- .../cdt/build/core/scannerconfig/ScannerConfigBuilder.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/build/core/scannerconfig/ScannerConfigBuilder.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/build/core/scannerconfig/ScannerConfigBuilder.java index 356bc1ab269..43d667c66e1 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/build/core/scannerconfig/ScannerConfigBuilder.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/build/core/scannerconfig/ScannerConfigBuilder.java @@ -11,8 +11,8 @@ package org.eclipse.cdt.build.core.scannerconfig; import java.util.Map; -import java.util.Properties; import java.util.Map.Entry; +import java.util.Properties; import org.eclipse.cdt.build.internal.core.scannerconfig.CfgDiscoveredPathManager; import org.eclipse.cdt.build.internal.core.scannerconfig.jobs.CfgSCJobsUtil; @@ -199,8 +199,9 @@ public class ScannerConfigBuilder extends ACBuilder { // update and persist scanner configuration CfgSCJobsUtil.updateScannerConfiguration(project, context, instance, buildInfo2, new SubProgressMonitor(monitor, 30)); - // this erroneously removes the infor right after it gets created... bad - //CfgDiscoveredPathManager.getInstance().removeDiscoveredInfo(project, context, false); + // Remove the previous discovered path info to ensure it get's regenerated. + // TODO we should really only do this if the information has changed + CfgDiscoveredPathManager.getInstance().removeDiscoveredInfo(project, context, false); if((flags & PERFORM_CORE_UPDATE) != 0) CfgDiscoveredPathManager.getInstance().updateCoreSettings(project, new IConfiguration[]{cfg});