Merge remote-tracking branch 'origin/master'

This commit is contained in:
Dmitry Trofimov
2014-06-10 14:27:39 +04:00
@@ -2579,7 +2579,7 @@ public class FileBasedIndexImpl extends FileBasedIndex {
VfsUtilCore.visitChildrenRecursively(root, new VirtualFileVisitor() {
@Override
public boolean visitFile(@NotNull VirtualFile file) {
if (visitedRoots != null && root != file && file.isDirectory() && !visitedRoots.add(file)) {
if (visitedRoots != null && !root.equals(file) && file.isDirectory() && !visitedRoots.add(file)) {
return false; // avoid visiting files more than once, e.g. additional indexed roots intersect sometimes
}
if (indicator != null) indicator.checkCanceled();