auto test: protect from NPE

This commit is contained in:
Sergey Simonchik
2016-03-22 14:44:37 +03:00
parent 25fbd6f39b
commit e79ce387eb
@@ -253,12 +253,15 @@ public class AutoTestManager implements PersistentStateComponent<AutoTestManager
public void loadState(State state) {
List<RunConfiguration> configurations = ContainerUtil.newArrayList();
RunManagerImpl runManager = RunManagerImpl.getInstanceImpl(myProject);
for (RunConfigurationDescriptor descriptor : state.myEnabledRunConfigurations) {
RunnerAndConfigurationSettings settings = runManager.findConfigurationByTypeAndName(descriptor.myType,
descriptor.myName);
RunConfiguration configuration = settings != null ? settings.getConfiguration() : null;
if (configuration != null) {
configurations.add(configuration);
List<RunConfigurationDescriptor> descriptors = ContainerUtil.notNullize(state.myEnabledRunConfigurations);
for (RunConfigurationDescriptor descriptor : descriptors) {
if (descriptor.myType != null && descriptor.myName != null) {
RunnerAndConfigurationSettings settings = runManager.findConfigurationByTypeAndName(descriptor.myType,
descriptor.myName);
RunConfiguration configuration = settings != null ? settings.getConfiguration() : null;
if (configuration != null) {
configurations.add(configuration);
}
}
}
myEnabledRunProfiles.clear();