Merge pull request #5276 from microsoft/bugfix-preload-bug

Fix bug of sp login:java.lang.IllegalStateException: Attempt to mutate in notification

Author: Flanker32

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

@@ -276,39 +276,38 @@ private void uiTextComponents2Json() {
     }
 
     private void json2UIComponents(String json) {
-        intermediateState = true;
         try {
-            if (StringUtils.isNotBlank(json)) {
-                try {
-                    Map<String, String> map = JsonUtils.fromJson(json, HashMap.class);
-                    if (map != null) {
-                        ApplicationManager.getApplication().invokeAndWait(() -> {
-                            if (map.containsKey("appId")) {
-                                this.clientIdTextField.setText(StringUtils.defaultString(map.get("appId")));
-                            }
-
-                            if (map.containsKey("tenant")) {
-                                this.tenantIdTextField.setText(StringUtils.defaultString(map.get("tenant")));
-                            }
-
-                            if (map.containsKey("password") && !isPlaceHolder(map.get("password"))) {
-                                this.passwordRadioButton.setSelected(true);
-                                this.keyPasswordField.setText(StringUtils.defaultString(map.get("password")));
-                            }
-
-                            if (map.containsKey("fileWithCertAndPrivateKey")) {
-                                this.certificateRadioButton.setSelected(true);
-                                this.certFileTextField.setText(StringUtils.defaultString(map.get("fileWithCertAndPrivateKey")));
-                            }
-                        });
+            Map<String, String> map = JsonUtils.fromJson(json, HashMap.class);
+            if (map != null) {
+                ApplicationManager.getApplication().invokeLater(() -> {
+                    intermediateState = true;
+                    try {
+                        if (map.containsKey("appId")) {
+                            this.clientIdTextField.setText(StringUtils.defaultString(map.get("appId")));
+                        }
+
+                        if (map.containsKey("tenant")) {
+                            this.tenantIdTextField.setText(StringUtils.defaultString(map.get("tenant")));
+                        }
+
+                        if (map.containsKey("password") && !isPlaceHolder(map.get("password"))) {
+                            this.passwordRadioButton.setSelected(true);
+                            this.keyPasswordField.setText(StringUtils.defaultString(map.get("password")));
+                        }
+
+                        if (map.containsKey("fileWithCertAndPrivateKey")) {
+                            this.certificateRadioButton.setSelected(true);
+                            this.certFileTextField.setText(StringUtils.defaultString(map.get("fileWithCertAndPrivateKey")));
+                        }
+                    } finally {
+                        intermediateState = false;
                     }
 
-                } catch (JsonSyntaxException ex) {
-                    // ignore all json errors
-                }
+                });
             }
-        } finally {
-            intermediateState = false;
+
+        } catch (JsonSyntaxException ex) {
+            // ignore all json errors
         }
     }
 

Utils/azuretools-core/src/com/microsoft/azuretools/authmanage/AuthMethodManager.java

@@ -296,10 +296,10 @@ private void initAuthMethodManagerFromSettings() {
                     List<String> savedSubscriptionList = persistSubscriptions.stream().filter(SubscriptionDetail::isSelected).map(SubscriptionDetail::getSubscriptionId).distinct().collect(Collectors.toList());
                     identityAzureManager.selectSubscriptionByIds(savedSubscriptionList);
                 }
-
+                initFuture.complete(true);
                 // pre-load regions
                 AzureAccount az = com.microsoft.azure.toolkit.lib.Azure.az(AzureAccount.class);
-                Optional.of(identityAzureManager.getSelectedSubscriptionIds()).ifPresent(sids -> sids.forEach(az::listRegions));
+                Optional.of(identityAzureManager.getSelectedSubscriptionIds()).ifPresent(sids -> sids.stream().limit(5).forEach(az::listRegions));
 
                 final String authMethod = authMethodDetails.getAuthMethod() == null ? "Empty" : authMethodDetails.getAuthMethod().name();
                 final Map<String, String> telemetryProperties = new HashMap<String, String>() {
@@ -308,7 +308,6 @@ private void initAuthMethodManagerFromSettings() {
                         put(AZURE_ENVIRONMENT, CommonSettings.getEnvironment().getName());
                     }
                 };
-                initFuture.complete(true);
                 EventUtil.logEvent(EventType.info, operation, telemetryProperties);
             } catch (RuntimeException exception) {
                 initFuture.complete(true);