MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fix NPE in "ProjectLevelVcsManagerImpl.getVcsRootObjectFor()"

Browse Source 
EA-100497
This commit is contained in:
Konstantin Kolosovsky
2017-09-12 17:27:52 +03:00
parent 467e6d3791
commit 74165cccf8
1 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/impl/ProjectLevelVcsManagerImpl.java
+13 -19
View File
@@ -286,7 +286,7 @@ public class ProjectLevelVcsManagerImpl extends ProjectLevelVcsManagerEx impleme
@Override
@Nullable
public AbstractVcs getVcsFor(final FilePath file) {
public AbstractVcs getVcsFor(@NotNull FilePath file) {
final VirtualFile vFile = ChangesUtil.findValidParentAccurately(file);
return ReadAction.compute(() -> {
if (!ApplicationManager.getApplication().isUnitTestMode() && !myProject.isInitialized()) return null;
@@ -315,11 +315,11 @@ public class ProjectLevelVcsManagerImpl extends ProjectLevelVcsManagerEx impleme
@Override
@Nullable
public VcsRoot getVcsRootObjectFor(final VirtualFile file) {
public VcsRoot getVcsRootObjectFor(@Nullable VirtualFile file) {
if (file == null) return null;
final VcsDirectoryMapping mapping = myMappings.getMappingFor(file);
if (mapping == null) {
return null;
}
if (mapping == null) return null;
final String directory = mapping.getDirectory();
final AbstractVcs vcs = findVcsByName(mapping.getVcs());
if (directory.isEmpty()) {
@@ -330,25 +330,19 @@ public class ProjectLevelVcsManagerImpl extends ProjectLevelVcsManagerEx impleme
@Override
@Nullable
public VirtualFile getVcsRootFor(final FilePath file) {
if (myProject.isDisposed()) return null;
public VirtualFile getVcsRootFor(@Nullable FilePath file) {
if (file == null || myProject.isDisposed()) return null;
VirtualFile vFile = ChangesUtil.findValidParentAccurately(file);
if (vFile != null) {
return getVcsRootFor(vFile);
}
return null;
return vFile != null ? getVcsRootFor(vFile) : null;
}
@Override
public VcsRoot getVcsRootObjectFor(final FilePath file) {
if (myProject.isDisposed()) {
return null;
}
public VcsRoot getVcsRootObjectFor(@Nullable FilePath file) {
if (file == null || myProject.isDisposed()) return null;
VirtualFile vFile = ChangesUtil.findValidParentAccurately(file);
if (vFile != null) {
return getVcsRootObjectFor(vFile);
}
return null;
return vFile != null ? getVcsRootObjectFor(vFile) : null;
}
public void unregisterVcs(@NotNull AbstractVcs vcs) {