Skip to content

Commit e68d889

Browse files
Flanker-MSFTFlanker-MSFT
authored andcommitted
fix loadEnv in DotEnvBeforeRunTask may be executed with read lock
1 parent 619ad2c commit e68d889

File tree

1 file changed

+5
-4
lines changed
  • PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-resource-connector-lib-java/src/main/java/com/microsoft/azure/toolkit/intellij/connector/dotazure

1 file changed

+5
-4
lines changed

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-resource-connector-lib-java/src/main/java/com/microsoft/azure/toolkit/intellij/connector/dotazure/DotEnvRunConfigurationExtension.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import com.intellij.execution.configurations.RunnerSettings;
77
import com.microsoft.azure.toolkit.lib.common.messager.ExceptionNotification;
88
import com.microsoft.azure.toolkit.lib.common.operation.AzureOperation;
9+
import com.microsoft.azure.toolkit.lib.common.task.AzureTaskManager;
910

1011
import javax.annotation.Nonnull;
1112

@@ -15,11 +16,11 @@ public class DotEnvRunConfigurationExtension extends RunConfigurationExtension {
1516
@ExceptionNotification
1617
@AzureOperation(name = "platform/connector.inject_env.config", params = {"config.getName()"})
1718
public <T extends RunConfigurationBase<?>> void updateJavaParameters(@Nonnull T config, @Nonnull JavaParameters params, RunnerSettings s) {
18-
config.getBeforeRunTasks().stream()
19-
.filter(t -> t instanceof DotEnvBeforeRunTaskProvider.LoadDotEnvBeforeRunTask)
20-
.map(t -> (DotEnvBeforeRunTaskProvider.LoadDotEnvBeforeRunTask) t)
19+
AzureTaskManager.getInstance().runLater(() -> config.getBeforeRunTasks().stream()
20+
.filter(t -> t instanceof DotEnvBeforeRunTaskProvider.LoadDotEnvBeforeRunTask)
21+
.map(t -> (DotEnvBeforeRunTaskProvider.LoadDotEnvBeforeRunTask) t)
2122
.flatMap(t -> t.loadEnv().stream())
22-
.forEach(p -> params.addEnv(p.getKey(), p.getValue()));
23+
.forEach(p -> params.addEnv(p.getKey(), p.getValue())));
2324
}
2425

2526
@Override

0 commit comments

Comments
 (0)