EA-97516 - NPE: ProjectJdkConfigurable.reloadModel

This commit is contained in:
Denis Fokin
2017-03-01 15:25:25 +03:00
parent c0a44a06a7
commit df5d4ae535
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2016 JetBrains s.r.o.
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -116,7 +116,9 @@ public class ProjectJdkConfigurable implements UnnamedConfigurable {
private void reloadModel() {
myFreeze = true;
final Sdk projectJdk = myJdksModel.getProjectSdk();
myCbProjectJdk.reloadModel(new JdkComboBox.NoneJdkComboBoxItem(), myProject);
if (myCbProjectJdk != null) {
myCbProjectJdk.reloadModel(new JdkComboBox.NoneJdkComboBoxItem(), myProject);
}
final String sdkName = projectJdk == null ? ProjectRootManager.getInstance(myProject).getProjectSdkName() : projectJdk.getName();
if (sdkName != null) {
final Sdk jdk = myJdksModel.findSdk(sdkName);