Skip to content

Commit 73608b4

Browse files
#1905738: [Test]An error pops up when opening the settings causing settings page not work for new users
1 parent 495d883 commit 73608b4

File tree

1 file changed

+5
-2
lines changed
  • PluginsAndFeatures/azure-toolkit-for-intellij/src/main/java/com/microsoft/intellij/ui

1 file changed

+5
-2
lines changed

PluginsAndFeatures/azure-toolkit-for-intellij/src/main/java/com/microsoft/intellij/ui/AzurePanel.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public void init() {
7171
azureEnvironmentComboBox.setRenderer(new SimpleListCellRenderer<>() {
7272
@Override
7373
public void customize(@NotNull JList list, AzureEnvironment value, int index, boolean selected, boolean hasFocus) {
74-
setText(azureEnvironmentDisplayString(value));
74+
setText(azureEnvironmentDisplayString(value));
7575
}
7676
});
7777
azureEnvDesc.setForeground(UIUtil.getContextHelpForeground());
@@ -92,7 +92,10 @@ public void setData(AzureConfiguration config) {
9292
//ignore
9393
funcCoreToolsPath.setValue(config.getFunctionCoreToolsPath());
9494
}
95-
savePasswordComboBox.setValue(new AzureComboBox.ItemReference<>(config.getDatabasePasswordSaveType().toLowerCase(), e -> e.name().toLowerCase()));
95+
final String passwordSaveType = config.getDatabasePasswordSaveType();
96+
if (Objects.nonNull(passwordSaveType)) {
97+
savePasswordComboBox.setValue(new AzureComboBox.ItemReference<>(passwordSaveType, e -> e.name().toLowerCase()));
98+
}
9699
allowTelemetryCheckBox.setSelected(config.getTelemetryEnabled());
97100

98101
azureEnvironmentComboBox.setSelectedItem(ObjectUtils.firstNonNull(AzureEnvironmentUtils.stringToAzureEnvironment(config.getCloud()),

0 commit comments

Comments
 (0)