From 62077d5c9068faa29403a61c32a740824699b154 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Thu, 30 Aug 2012 16:24:08 +0400
Subject: [PATCH] Cleanup

---
 .../src/com/intellij/openapi/vcs/FilePathImpl.java    | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/FilePathImpl.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/FilePathImpl.java
index 24d0966c22ab..efb49b2029ee 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/FilePathImpl.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/FilePathImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2012 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.
@@ -26,7 +26,7 @@ import com.intellij.openapi.util.Comparing;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.LocalFileSystem;
-import com.intellij.openapi.vfs.VfsUtil;
+import com.intellij.openapi.vfs.VfsUtilCore;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.openapi.vfs.encoding.EncodingManager;
 import com.intellij.openapi.vfs.encoding.EncodingProjectManager;
@@ -181,8 +181,11 @@ public class FilePathImpl implements FilePath {
 
   @Override
   public boolean isUnder(FilePath parent, boolean strict) {
-    if (myVirtualFile != null && parent.getVirtualFile() != null) {
-      return VfsUtil.isAncestor(parent.getVirtualFile(), myVirtualFile, strict);
+    if (myVirtualFile != null) {
+      final VirtualFile parentFile = parent.getVirtualFile();
+      if (parentFile != null) {
+        return VfsUtilCore.isAncestor(parentFile, myVirtualFile, strict);
+      }
     }
     return FileUtil.isAncestor(parent.getIOFile(), getIOFile(), strict);
   }