Skip to content

Commit a82ca9c

Browse files
committed
Fix the issue that SSH not empty for new run configuration
Signed-off-by: Zhang Wei <[email protected]>
1 parent 7913ab2 commit a82ca9c

File tree

3 files changed

+14
-6
lines changed

3 files changed

+14
-6
lines changed

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/hdinsight/spark/common/SparkSubmitModel.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,6 @@ public class SparkSubmitModel {
8787

8888
private static Map<Project, SparkSubmissionParameter> submissionParameterMap = new HashMap<>();
8989

90-
private static Map<Project, SparkSubmitAdvancedConfigModel> submissionAdvancedConfigModelMap = new HashMap<>();
91-
9290
private final Project project;
9391

9492
private List<IClusterDetail> cachedClusterDetails;
@@ -119,7 +117,6 @@ public SparkSubmitModel(@NotNull Project project, @NotNull SparkSubmissionParame
119117
this.clusterComboBoxModel = new DefaultComboBoxModel<>();
120118
this.artifactComboBoxModel = new DefaultComboBoxModel<>();
121119
this.submissionParameter = submissionParameter;
122-
this.advancedConfigModel = submissionAdvancedConfigModelMap.get(project);
123120

124121
final List<Artifact> artifacts = ArtifactUtil.getArtifactWithOutputPaths(project);
125122

@@ -152,7 +149,6 @@ public void setSubmissionParameters(SparkSubmissionParameter submissionParameter
152149

153150
public void setAdvancedConfigModel(SparkSubmitAdvancedConfigModel advancedConfigModel) {
154151
this.advancedConfigModel = advancedConfigModel;
155-
submissionAdvancedConfigModelMap.put(project, this.advancedConfigModel);
156152
}
157153

158154
@NotNull

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/hdinsight/spark/run/configuration/RemoteDebugConfigurationFactory.java

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@
2121
*/
2222
package com.microsoft.azure.hdinsight.spark.run.configuration;
2323

24-
import com.intellij.execution.configurations.ConfigurationFactory;
24+
import com.intellij.execution.configuration.ConfigurationFactoryEx;
2525
import com.intellij.execution.configurations.ConfigurationType;
2626
import com.intellij.execution.configurations.RunConfiguration;
2727
import com.intellij.execution.configurations.RunConfigurationModule;
2828
import com.intellij.openapi.project.Project;
2929
import com.microsoft.azuretools.azurecommons.helpers.NotNull;
3030

31-
public class RemoteDebugConfigurationFactory extends ConfigurationFactory{
31+
public class RemoteDebugConfigurationFactory extends ConfigurationFactoryEx {
3232
private static final String NAME = "Submit Spark Job";
3333

3434
protected RemoteDebugConfigurationFactory(@NotNull ConfigurationType type) {
@@ -49,4 +49,12 @@ public RunConfiguration createTemplateConfiguration(@NotNull Project project) {
4949
new RunConfigurationModule(project),
5050
NAME);
5151
}
52+
53+
@Override
54+
public void onNewConfigurationCreated(@org.jetbrains.annotations.NotNull RunConfiguration configuration) {
55+
RemoteDebugRunConfiguration sparkRemoteDebugConfiguration = (RemoteDebugRunConfiguration) configuration;
56+
sparkRemoteDebugConfiguration.setAsNew();
57+
58+
super.onNewConfigurationCreated(configuration);
59+
}
5260
}

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/hdinsight/spark/run/configuration/RemoteDebugRunConfiguration.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,5 +100,9 @@ public void apply(SparkSubmissionContentPanel submissionPanel) {
100100
this.submitModel.setSubmissionParameters(submissionPanel.constructSubmissionParameter());
101101
this.submitModel.setAdvancedConfigModel(submissionPanel.getSubmitModel().getAdvancedConfigModel());
102102
}
103+
104+
public void setAsNew() {
105+
this.submitModel.setAdvancedConfigModel(null);
106+
}
103107
}
104108

0 commit comments

Comments
 (0)