Skip to content

Commit 85fcb9f

Browse files
authored
Fix NPE and save missing monitor configuration in webapp setting model (#4736)
1 parent 5b7704a commit 85fcb9f

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/webapp/WebAppConfigFormPanelAdvance.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ private void createUIComponents() {
9999

100100
appServiceConfigPanelAdvanced.getSelectorPlatform().addActionListener(event -> {
101101
final Platform platform = appServiceConfigPanelAdvanced.getSelectorPlatform().getValue();
102-
appServiceMonitorPanel.setApplicationLogVisible(platform.getOs() == OperatingSystem.WINDOWS);
102+
appServiceMonitorPanel.setApplicationLogVisible(platform != null && platform.getOs() == OperatingSystem.WINDOWS);
103103
});
104104
}
105105
}

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/intellij/runner/webapp/webappconfig/WebAppConfiguration.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -419,6 +419,13 @@ public void saveModel(final WebAppComboBoxModel webAppComboBoxModel) {
419419
setWebContainer(settingModel.getWebContainer());
420420
setCreatingResGrp(settingModel.isCreatingResGrp());
421421
setCreatingAppServicePlan(settingModel.isCreatingAppServicePlan());
422+
webAppSettingModel.setEnableApplicationLog(settingModel.isEnableApplicationLog());
423+
webAppSettingModel.setApplicationLogLevel(settingModel.getApplicationLogLevel());
424+
webAppSettingModel.setEnableWebServerLogging(settingModel.isEnableWebServerLogging());
425+
webAppSettingModel.setWebServerLogQuota(settingModel.getWebServerLogQuota());
426+
webAppSettingModel.setWebServerRetentionPeriod(settingModel.getWebServerRetentionPeriod());
427+
webAppSettingModel.setEnableDetailedErrorMessage(settingModel.isEnableDetailedErrorMessage());
428+
webAppSettingModel.setEnableFailedRequestTracing(settingModel.isEnableFailedRequestTracing());
422429
} else {
423430
setCreatingNew(false);
424431
final WebApp webApp = webAppComboBoxModel.getResource();

0 commit comments

Comments
 (0)