From e7f69c99e56d8129fc8883e3c51f3cfb26e816d4 Mon Sep 17 00:00:00 2001 From: Andrey Vlasovskikh Date: Sat, 26 May 2018 17:10:05 +0300 Subject: [PATCH] Fixed NPE --- .../jetbrains/python/packaging/PyPackageManagersImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/python/src/com/jetbrains/python/packaging/PyPackageManagersImpl.java b/python/src/com/jetbrains/python/packaging/PyPackageManagersImpl.java index d3adf9ae5e63..a50bd05bfdd1 100644 --- a/python/src/com/jetbrains/python/packaging/PyPackageManagersImpl.java +++ b/python/src/com/jetbrains/python/packaging/PyPackageManagersImpl.java @@ -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 {