Fix NPE and save missing monitor configuration in webapp setting model (

#4736)
microsoft · Nov 9, 2020 · 85fcb9f · 85fcb9f
1 parent 5b7704a
commit 85fcb9f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/...ntellij/src/com/microsoft/azure/toolkit/intellij/webapp/WebAppConfigFormPanelAdvance.java b/...ntellij/src/com/microsoft/azure/toolkit/intellij/webapp/WebAppConfigFormPanelAdvance.java
@@ -99,7 +99,7 @@ private void createUIComponents() {
 
         appServiceConfigPanelAdvanced.getSelectorPlatform().addActionListener(event -> {
             final Platform platform = appServiceConfigPanelAdvanced.getSelectorPlatform().getValue();
-            appServiceMonitorPanel.setApplicationLogVisible(platform.getOs() == OperatingSystem.WINDOWS);
+            appServiceMonitorPanel.setApplicationLogVisible(platform != null && platform.getOs() == OperatingSystem.WINDOWS);
         });
     }
 }
diff --git a/...r-intellij/src/com/microsoft/intellij/runner/webapp/webappconfig/WebAppConfiguration.java b/...r-intellij/src/com/microsoft/intellij/runner/webapp/webappconfig/WebAppConfiguration.java
@@ -419,6 +419,13 @@ public void saveModel(final WebAppComboBoxModel webAppComboBoxModel) {
             setWebContainer(settingModel.getWebContainer());
             setCreatingResGrp(settingModel.isCreatingResGrp());
             setCreatingAppServicePlan(settingModel.isCreatingAppServicePlan());
+            webAppSettingModel.setEnableApplicationLog(settingModel.isEnableApplicationLog());
+            webAppSettingModel.setApplicationLogLevel(settingModel.getApplicationLogLevel());
+            webAppSettingModel.setEnableWebServerLogging(settingModel.isEnableWebServerLogging());
+            webAppSettingModel.setWebServerLogQuota(settingModel.getWebServerLogQuota());
+            webAppSettingModel.setWebServerRetentionPeriod(settingModel.getWebServerRetentionPeriod());
+            webAppSettingModel.setEnableDetailedErrorMessage(settingModel.isEnableDetailedErrorMessage());
+            webAppSettingModel.setEnableFailedRequestTracing(settingModel.isEnableFailedRequestTracing());
         } else {
             setCreatingNew(false);
             final WebApp webApp = webAppComboBoxModel.getResource();