Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorAlena Laskavaia2008-10-21 20:21:00 +0000
committerAlena Laskavaia2008-10-21 20:21:00 +0000
commitcade3e70c6a365cc0a21116f0d7b9c447338c0f2 (patch)
tree5afdc2f0d52de36b5511cb84be970fe26a292530 /build
parentc952b7c60da89b9b2f5dd478ade399dbddd06785 (diff)
downloadorg.eclipse.cdt-cade3e70c6a365cc0a21116f0d7b9c447338c0f2.tar.gz
org.eclipse.cdt-cade3e70c6a365cc0a21116f0d7b9c447338c0f2.tar.xz
org.eclipse.cdt-cade3e70c6a365cc0a21116f0d7b9c447338c0f2.zip
[140424] ArrayIndexOutOfBoundsException when creating a new project with ScannerConfigurationDiscoveryProfile extension defined
Diffstat (limited to 'build')
-rw-r--r--build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/build/core/scannerconfig/ScannerConfigBuilder.java7
1 files changed, 6 insertions, 1 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 004fb28d9da..775462fbd5d 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
@@ -26,6 +26,7 @@ import org.eclipse.cdt.core.settings.model.ICConfigurationDescription;
import org.eclipse.cdt.core.settings.model.ICProjectDescription;
import org.eclipse.cdt.make.core.scannerconfig.IScannerConfigBuilderInfo2;
import org.eclipse.cdt.make.internal.core.scannerconfig2.SCProfileInstance;
+import org.eclipse.cdt.make.internal.core.scannerconfig2.ScannerConfigProfileManager;
import org.eclipse.cdt.managedbuilder.core.IConfiguration;
import org.eclipse.cdt.managedbuilder.core.IManagedBuildInfo;
import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
@@ -176,7 +177,11 @@ public class ScannerConfigBuilder extends ACBuilder {
env = calcEnvironment(cfg);
// get scanner info from all external providers
- SCProfileInstance instance = CfgSCJobsUtil.getProviderScannerInfo(project, context, null, buildInfo2, env, new SubProgressMonitor(monitor, 70));
+ SCProfileInstance instance = ScannerConfigProfileManager.getInstance().
+ getSCProfileInstance(project, context.toInfoContext(), buildInfo2.getSelectedProfileId());
+ // if there are any providers call job to pull scanner info
+ if ((instance == null) || !buildInfo2.getProviderIdList().isEmpty())
+ instance = CfgSCJobsUtil.getProviderScannerInfo(project, context, instance, buildInfo2, env, new SubProgressMonitor(monitor, 70));
// update and persist scanner configuration
CfgSCJobsUtil.updateScannerConfiguration(project, context, instance, buildInfo2, new SubProgressMonitor(monitor, 30));

Back to the top