From 74165cccf896484c19c16548eb3f1b9aad105ecb Mon Sep 17 00:00:00 2001
From: Konstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Date: Mon, 4 Sep 2017 09:14:36 +0300
Subject: [PATCH] Fix NPE in "ProjectLevelVcsManagerImpl.getVcsRootObjectFor()"

EA-100497
---
 .../vcs/impl/ProjectLevelVcsManagerImpl.java  | 32 ++++++++-----------
 1 file changed, 13 insertions(+), 19 deletions(-)

diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/ProjectLevelVcsManagerImpl.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/ProjectLevelVcsManagerImpl.java
index 4e207b63ac2c..a1836efc3e59 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/ProjectLevelVcsManagerImpl.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/ProjectLevelVcsManagerImpl.java
@@ -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) {