Skip to content

Commit 5b7704a

Browse files
authored
Fix subscription npe in app service creation basic panel (#4735)
1 parent 61c8b7a commit 5b7704a

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/appservice/AppNameInput.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public AzureValidationInfo doValidateValue() {
4444
final AzureValidationInfo info = super.doValidateValue();
4545
if (info == AzureValidationInfo.OK) {
4646
try {
47-
ValidationUtils.validateAppServiceName(this.subscription.subscriptionId(), this.getValue());
47+
ValidationUtils.validateAppServiceName(subscription != null ? subscription.subscriptionId() : null, this.getValue());
4848
} catch (final IllegalArgumentException e) {
4949
final AzureValidationInfo.AzureValidationInfoBuilder builder = AzureValidationInfo.builder();
5050
return builder.input(this).message(e.getMessage()).type(AzureValidationInfo.Type.ERROR).build();

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/appservice/AppServiceInfoBasicPanel.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ public class AppServiceInfoBasicPanel<T extends AppServiceConfig> extends JPanel
6565
private TitledSeparator deploymentTitle;
6666
private JLabel deploymentLabel;
6767

68+
private Subscription subscription;
69+
6870
public AppServiceInfoBasicPanel(final Project project, final Supplier<T> defaultConfigSupplier) {
6971
super();
7072
this.project = project;
@@ -74,7 +76,9 @@ public AppServiceInfoBasicPanel(final Project project, final Supplier<T> default
7476
}
7577

7678
private void init() {
79+
this.subscription = AzureMvpModel.getInstance().getSelectedSubscriptions().get(0);
7780
this.textName.setRequired(true);
81+
this.textName.setSubscription(subscription);
7882
this.selectorPlatform.setRequired(true);
7983

8084
this.selectorApplication.setFileFilter(virtualFile -> {
@@ -109,7 +113,6 @@ public T getData() {
109113

110114
private T initConfig() {
111115
final String appName = String.format("app-%s-%s", this.project.getName(), DATE_FORMAT.format(new Date()));
112-
final Subscription subscription = AzureMvpModel.getInstance().getSelectedSubscriptions().get(0);
113116
final DraftResourceGroup group = DraftResourceGroup.builder().build();
114117
group.setName(StringUtils.substring(String.format("rg-%s", appName), 0, RG_NAME_MAX_LENGTH));
115118
group.setSubscription(subscription);

0 commit comments

Comments
 (0)