# HG changeset patch # User Maria Zhelezova # Date 1285051382 -10800 # Node ID 350c5c4e8c97cc4bb5022121fd9454f2de590955 # Parent eb17a7f7f320b4caf23429bf1c0315a7f75fbcfc Framework 1.9.0.2 diff -r eb17a7f7f320 -r 350c5c4e8c97 frameworkplugins/com.nokia.s60tools.extensions.framework/feature.xml --- a/frameworkplugins/com.nokia.s60tools.extensions.framework/feature.xml Wed Sep 15 17:28:26 2010 +0300 +++ b/frameworkplugins/com.nokia.s60tools.extensions.framework/feature.xml Tue Sep 21 09:43:02 2010 +0300 @@ -2,7 +2,7 @@ diff -r eb17a7f7f320 -r 350c5c4e8c97 frameworkplugins/com.nokia.s60tools.extensions.framework/release_notes.txt --- a/frameworkplugins/com.nokia.s60tools.extensions.framework/release_notes.txt Wed Sep 15 17:28:26 2010 +0300 +++ b/frameworkplugins/com.nokia.s60tools.extensions.framework/release_notes.txt Tue Sep 21 09:43:02 2010 +0300 @@ -1,7 +1,7 @@ ------------------------- ------------------------- Framework – Version 1.9.0 -Released 13th April 2010 +Released 31st August 2010 ------------------------- ------------------------- diff -r eb17a7f7f320 -r 350c5c4e8c97 frameworkplugins/com.nokia.s60tools.util/src/com/nokia/s60tools/util/sourcecode/ProjectUtils.java --- a/frameworkplugins/com.nokia.s60tools.util/src/com/nokia/s60tools/util/sourcecode/ProjectUtils.java Wed Sep 15 17:28:26 2010 +0300 +++ b/frameworkplugins/com.nokia.s60tools.util/src/com/nokia/s60tools/util/sourcecode/ProjectUtils.java Tue Sep 21 09:43:02 2010 +0300 @@ -31,6 +31,7 @@ import com.nokia.carbide.cdt.builder.CarbideBuilderPlugin; import com.nokia.carbide.cpp.project.core.ProjectCorePlugin; +import com.nokia.carbide.cpp.sdk.core.ISDKBuildInfo; import com.nokia.carbide.cpp.sdk.core.ISDKManager; import com.nokia.carbide.cpp.sdk.core.ISymbianBuildContext; import com.nokia.carbide.cpp.sdk.core.ISymbianBuilderID; @@ -159,10 +160,14 @@ boolean sbsv2Project = project.hasNature(CarbideBuilderPlugin.CARBIDE_SBSV2_PROJECT_NATURE_ID); String builderId = sbsv2Project ? ISymbianBuilderID.SBSV2_BUILDER : ISymbianBuilderID.SBSV1_BUILDER; - - List buildConfigs = - sdk.getBuildInfo(builderId).getFilteredBuildConfigurations(); - + + // If there is no build info for the builderId, null is returned. + ISDKBuildInfo info = sdk.getBuildInfo(builderId); + + // null buildConfigs list is not allowed. + List buildConfigs = (null != info) ? + info.getFilteredBuildConfigurations() : new ArrayList(); + List infComponentsList = new ArrayList(); ICProject cProject = ProjectCorePlugin.postProjectCreatedActions(