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

[shelve]: IDEA-145658 fix possible NPE

Browse Source
This commit is contained in:
Nadya Zabrodina
2015-10-24 19:05:04 +03:00
parent b0aee00797
commit 2ebe2b08a7
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/MatchPatchPaths.java
+3 -1
View File
@@ -30,6 +30,7 @@ import com.intellij.openapi.vcs.changes.shelf.ShelveChangesManager.ShelvedBinary
import com.intellij.openapi.vfs.VfsUtil;
import com.intellij.openapi.vfs.VfsUtilCore;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.util.ArrayUtil;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.containers.Convertor;
import com.intellij.util.containers.MultiMap;
@@ -77,7 +78,8 @@ public class MatchPatchPaths {
@NotNull List<FilePatch> newOrWithoutMatches,
@NotNull MultiMap<VirtualFile, AbstractFilePatchInProgress> result) {
for (FilePatch patch : newOrWithoutMatches) {
final String[] strings = patch.getAfterName().replace('\\', '/').split("/");
String afterName = patch.getAfterName();
final String[] strings = afterName != null ? afterName.replace('\\', '/').split("/") : ArrayUtil.EMPTY_STRING_ARRAY;
Pair<VirtualFile, Integer> best = null;
for (int i = strings.length - 2; i >= 0; --i) {
final String name = strings[i];