Fixed NPE

This commit is contained in:
Andrey Vlasovskikh
2018-06-15 21:24:41 +03:00
parent 780cb3698b
commit e7f69c99e5
@@ -17,6 +17,7 @@ package com.jetbrains.python.packaging;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.projectRoots.Sdk;
import com.intellij.openapi.vfs.VirtualFile;
import com.jetbrains.python.packaging.ui.PyCondaManagementService;
import com.jetbrains.python.packaging.ui.PyPackageManagementService;
import com.jetbrains.python.sdk.PythonSdkType;
@@ -36,10 +37,13 @@ public class PyPackageManagersImpl extends PyPackageManagers {
final String key = PythonSdkType.getSdkKey(sdk);
PyPackageManagerImpl manager = myInstances.get(key);
if (manager == null) {
final VirtualFile homeDirectory = sdk.getHomeDirectory();
if (PythonSdkType.isRemote(sdk)) {
manager = new PyRemotePackageManagerImpl(sdk);
}
else if (PyCondaPackageManagerImpl.isConda(sdk) && PyCondaPackageService.getCondaExecutable(sdk.getHomeDirectory()) != null) {
else if (PyCondaPackageManagerImpl.isConda(sdk) &&
homeDirectory != null &&
PyCondaPackageService.getCondaExecutable(homeDirectory) != null) {
manager = new PyCondaPackageManagerImpl(sdk);
}
else {