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

NPE: LazyPatchContentRevision.getContent (http://ea.jetbrains.com/browser/ea_problems/17462)

Browse Source
This commit is contained in:
irengrig
2010-01-25 12:11:23 +03:00
parent 8ef0015554
commit 35c4766970
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/patch/LazyPatchContentRevision.java
+4 -1
View File
@@ -20,7 +20,6 @@ import com.intellij.openapi.diff.impl.patch.TextFilePatch;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.fileEditor.FileDocumentManager;
import com.intellij.openapi.vcs.FilePath;
import com.intellij.openapi.vcs.VcsException;
import com.intellij.openapi.vcs.changes.ContentRevision;
import com.intellij.openapi.vcs.history.VcsRevisionNumber;
import com.intellij.openapi.vfs.VirtualFile;
@@ -45,6 +44,10 @@ public class LazyPatchContentRevision implements ContentRevision {
if (myContent == null) {
try {
final Document doc = FileDocumentManager.getInstance().getDocument(myVf);
if (doc == null) {
myPatchApplyFailed = true;
return null;
}
final String baseContent = doc.getText();
final StringBuilder newText = new StringBuilder();
myPatch.applyModifications(baseContent, newText);