From 35c4766970eeb051f24507e924abbf65eeafe41a Mon Sep 17 00:00:00 2001
From: irengrig <Irina.Chernushina@jetbrains.com>
Date: Mon, 25 Jan 2010 12:11:23 +0300
Subject: [PATCH] NPE: LazyPatchContentRevision.getContent
 (http://ea.jetbrains.com/browser/ea_problems/17462)

---
 .../openapi/vcs/changes/patch/LazyPatchContentRevision.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/LazyPatchContentRevision.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/LazyPatchContentRevision.java
index 59dcb7e6af16..4d027bfde718 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/LazyPatchContentRevision.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/LazyPatchContentRevision.java
@@ -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);