Skip to content

Commit 1b8e623

Browse files
Merge pull request #6876 from microsoft/bugfix-modal-task
tryConnecting action run in foreground task
2 parents 0638b9a + 6dbaa20 commit 1b8e623

File tree

1 file changed

+6
-3
lines changed
  • PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-vm/src/main/java/com/microsoft/azure/toolkit/intellij/vm/ssh

1 file changed

+6
-3
lines changed

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-vm/src/main/java/com/microsoft/azure/toolkit/intellij/vm/ssh/BrowseRemoteHostSftpAction.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import com.microsoft.azure.toolkit.lib.common.messager.AzureMessager;
2626
import com.microsoft.azure.toolkit.lib.common.operation.AzureOperation;
2727
import com.microsoft.azure.toolkit.lib.common.operation.OperationBundle;
28+
import com.microsoft.azure.toolkit.lib.common.task.AzureTask;
2829
import com.microsoft.azure.toolkit.lib.common.task.AzureTaskManager;
2930
import com.microsoft.azure.toolkit.lib.compute.virtualmachine.VirtualMachine;
3031
import org.apache.commons.lang3.reflect.MethodUtils;
@@ -56,16 +57,18 @@ public static void browseRemoteHost(VirtualMachine vm, @Nonnull Project project)
5657
private static void tryConnecting(@Nonnull Project project, SshConfig sshConfig, Runnable callback) {
5758
final SshUiData sshUiData = new SshUiData(sshConfig);
5859
final AzureString title = OperationBundle.description("vm.connecting.vm", sshConfig.getName());
59-
AzureTaskManager.getInstance().runInModal(title, () -> {
60+
final AzureTask<Void> task = new AzureTask<>(title, () -> {
6061
try {
6162
RemoteCredentialsUtil.connectionBuilder(sshUiData, project)
62-
.withConnectionTimeout(10L, TimeUnit.SECONDS)
63-
.checkCanAuthenticate(true);
63+
.withConnectionTimeout(10L, TimeUnit.SECONDS)
64+
.checkCanAuthenticate(true);
6465
AzureTaskManager.getInstance().runLater(callback);
6566
} catch (final SshException e) {
6667
AzureMessager.getMessager().error(e, title.toString());
6768
}
6869
});
70+
task.setBackgroundable(false);
71+
AzureTaskManager.getInstance().runInModal(task);
6972
}
7073

7174
private static void selectServerInToolWindow(ToolWindow toolWindow, String serverName, @Nonnull Project project) {

0 commit comments

Comments
 (0)