From 016c797cd5a403e540e2a0a01464e7f38b553e36 Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Sun, 7 Jun 2015 12:25:51 +0300 Subject: [PATCH] [svn] Explicitly assert not null --- .../idea/svn/treeConflict/MergeFromTheirsResolver.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/treeConflict/MergeFromTheirsResolver.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/treeConflict/MergeFromTheirsResolver.java index 35460faea33a..8ec2705b7718 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/treeConflict/MergeFromTheirsResolver.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/treeConflict/MergeFromTheirsResolver.java @@ -43,6 +43,7 @@ import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VfsUtil; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.Consumer; +import com.intellij.util.ObjectUtils; import com.intellij.util.SmartList; import com.intellij.util.containers.Convertor; import com.intellij.util.containers.MultiMap; @@ -492,7 +493,7 @@ public class MergeFromTheirsResolver { @NotNull private static FilePath rebasePath(@NotNull FilePath oldBase, @NotNull FilePath newBase, @NotNull FilePath path) { - String relativePath = FileUtil.getRelativePath(oldBase.getPath(), path.getPath(), '/'); + String relativePath = ObjectUtils.assertNotNull(FileUtil.getRelativePath(oldBase.getPath(), path.getPath(), '/')); return VcsUtil.getFilePath(newBase.getPath() + "/" + relativePath, path.isDirectory()); }