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

[shelf]: fix NPE for binary file deletion preview, use nullable context

Browse Source
This commit is contained in:
Nadya Zabrodina
2017-06-02 20:02:32 +03:00
parent 42c8e4880c
commit b3ca2daf60
1 changed files with 4 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/shelf/ShelvedChangesViewManager.java
+4 -1
View File
@@ -820,11 +820,14 @@ public class ShelvedChangesViewManager implements ProjectComponent {
try {
ShelvedChange shelvedChange = provider.getShelvedChange();
if (shelvedChange != null) {
return new PatchDiffRequest(createAppliedTextPatch(myPreloader.getPatch(shelvedChange, new CommitContext())));
return new PatchDiffRequest(createAppliedTextPatch(myPreloader.getPatch(shelvedChange, null)));
}
DiffContentFactoryEx factory = DiffContentFactoryEx.getInstanceEx();
ShelvedBinaryFile binaryFile = assertNotNull(provider.getBinaryFile());
if (binaryFile.AFTER_PATH == null) {
throw new DiffRequestProducerException("Content for '" + getRequestName(provider) + "' was removed");
}
byte[] binaryContent = binaryFile.createBinaryContentRevision(myProject).getBinaryContent();
FileType fileType = VcsUtil.getFilePath(binaryFile.SHELVED_PATH).getFileType();
return new SimpleDiffRequest(getRequestName(provider), factory.createEmpty(),