Skip to content

Commit b35ed4c

Browse files
authored
Fix possible NPE in function run configuration producer (#4583)
* Fix possible NPE in function run configuration producer * Fix checkstyle
1 parent 173fdd7 commit b35ed4c

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/intellij/runner/functions/FunctionRunConfigurationProducer.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,17 +55,17 @@ public ConfigurationFactory getConfigurationFactory() {
5555
}
5656

5757
@Override
58-
protected boolean setupConfigurationFromContext(AzureRunConfigurationBase configuration, ConfigurationContext context, Ref ref) {
59-
if (!(configuration instanceof FunctionRunConfiguration || configuration instanceof FunctionDeployConfiguration)) {
58+
protected boolean setupConfigurationFromContext(AzureRunConfigurationBase runConfigurationBase, ConfigurationContext context, Ref ref) {
59+
if (!(runConfigurationBase instanceof FunctionRunConfiguration || runConfigurationBase instanceof FunctionDeployConfiguration)) {
6060
return false;
6161
}
62-
6362
final Location contextLocation = context.getLocation();
6463
assert contextLocation != null;
6564
Location<PsiMethod> methodLocation = getAzureFunctionMethods(contextLocation);
6665
if (methodLocation == null) {
6766
return false;
6867
}
68+
AzureRunConfigurationBase configuration = runConfigurationBase;
6969
if (configuration instanceof FunctionDeployConfiguration) {
7070
final RunManagerEx manager = RunManagerEx.getInstanceEx(context.getProject());
7171
// since deploy configuration doesn't support, we need to create a FunctionRunConfiguration
@@ -85,6 +85,8 @@ protected boolean setupConfigurationFromContext(AzureRunConfigurationBase config
8585
final Module module = findModule(runConfiguration, contextModule);
8686
if (module != null) {
8787
runConfiguration.initializeDefaults(module);
88+
} else {
89+
return false;
8890
}
8991
}
9092
if (StringUtils.isBlank(configuration.getName())) {

0 commit comments

Comments
 (0)