es_aware_run_make: fix possible npe if ExecutionEnvironmentProvider is absent

This commit is contained in:
Vladislav.Soroka
2016-09-21 16:22:08 +03:00
parent eeeac2b21a
commit b194eb876f
@@ -166,9 +166,12 @@ public final class ExecutionEnvironmentBuilder {
@NotNull
public ExecutionEnvironment build() {
ExecutionEnvironment environment =
ServiceManager.getService(myProject, ExecutionEnvironmentProvider.class).createExecutionEnvironment(
ExecutionEnvironment environment = null;
ExecutionEnvironmentProvider environmentProvider = ServiceManager.getService(myProject, ExecutionEnvironmentProvider.class);
if (environmentProvider != null) {
environment = environmentProvider.createExecutionEnvironment(
myProject, myRunProfile, myExecutor, myTarget, myRunnerSettings, myConfigurationSettings, myRunnerAndConfigurationSettings);
}
if (environment == null && myRunner == null) {
if (myRunnerId == null) {