MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

PY-22424 Shutdown kernels on settings change

Browse Source
This commit is contained in:
Valentina Kiryushkina
2017-02-06 17:21:14 +03:00
parent fc52d799b9
commit 8d84e47e58
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/ipnb/src/org/jetbrains/plugins/ipnb/configuration/IpnbConfigurable.java
+9 -3
View File
@@ -73,15 +73,21 @@ public class IpnbConfigurable implements SearchableConfigurable {
@Override
public void apply() throws ConfigurationException {
String url = StringUtil.notNullize(myFieldUrl.getText());
url = StringUtil.trimEnd(url, "/");
IpnbSettings.getInstance(myProject).setURL(url);
IpnbSettings.getInstance(myProject).setWorkingDirectory(myWorkingDirField.getText());
IpnbSettings.getInstance(myProject).setArguments(myArgumentsField.getText());
String url = StringUtil.notNullize(myFieldUrl.getText());
url = StringUtil.trimEnd(url, "/");
final boolean urlModified = !url.equals(IpnbSettings.getInstance(myProject).getURL());
if (urlModified) {
IpnbSettings.getInstance(myProject).setURL(url);
IpnbConnectionManager.getInstance(myProject).shutdownKernels();
}
if (isCredentialsModified()) {
IpnbSettings.getInstance(myProject).setUsername(myUsernameField.getText());
IpnbSettings.getInstance(myProject).setPassword(String.valueOf(myPasswordField.getPassword()));
IpnbConnectionManager.getInstance(myProject).shutdownKernels();
}
}
python/ipnb/src/org/jetbrains/plugins/ipnb/configuration/IpnbConnectionManager.java
+1 -1
View File
@@ -544,7 +544,7 @@ public final class IpnbConnectionManager implements ProjectComponent {
shutdownKernels();
}
private void shutdownKernels() {
public void shutdownKernels() {
for (IpnbConnection connection : myKernels.values()) {
if (!connection.isAlive()) continue;
connection.shutdown();