Fix NPE in History View

Bug: 322231
Change-Id: I7fda6a3517c97b5e0131f6bd90da4966eff68f86
Signed-off-by: Jens Baumgart <jens.baumgart@sap.com>

3 files changed, 15 insertions, 1 deletions

diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIText.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIText.java
index 73929443f4..513fcf541b 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIText.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIText.java
@@ -2240,6 +2240,9 @@ public class UIText extends NLS {
 	public static String CommitAction_messagepart6;
 
 	/** */
+	public static String CommitFileDiffViewer_notContainedInCommit;
+
+	/** */
 	public static String GitSynchronizeWizard_synchronize;
 
 	/** */
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/CommitFileDiffViewer.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/CommitFileDiffViewer.java
index 6116c20a01..211ef9ebcd 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/CommitFileDiffViewer.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/CommitFileDiffViewer.java
@@ -32,6 +32,7 @@ import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jgit.lib.Repository;
 import org.eclipse.jgit.revwalk.RevCommit;
 import org.eclipse.jgit.treewalk.TreeWalk;
+import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.dnd.Clipboard;
 import org.eclipse.swt.dnd.DND;
@@ -103,7 +104,15 @@ class CommitFileDiffViewer extends TableViewer {
 			IWorkbenchPage page = window.getActivePage();
 			IFileRevision rev = CompareUtils.getFileRevision(d.path, d.commit,
 					db, d.blobs[0]);
-			EgitUiEditorUtils.openEditor(page, rev, new NullProgressMonitor());
+			if (rev != null)
+				EgitUiEditorUtils.openEditor(page, rev,
+						new NullProgressMonitor());
+			else {
+				String message = NLS.bind(
+						UIText.CommitFileDiffViewer_notContainedInCommit, d.path,
+						d.commit.getId().getName());
+				Activator.showError(message, null);
+			}
 		} catch (IOException e) {
 			Activator.logError(UIText.GitHistoryPage_openFailed, e);
 			Activator.showError(UIText.GitHistoryPage_openFailed, null);
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties
index 800e8ebaef..044e8733da 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties
@@ -791,6 +791,8 @@ CommitAction_messagepart4=and try again.
 CommitAction_messagepart5=Please enter the commit message for your changes. Lines starting
 CommitAction_messagepart6=with '\#' will be ignored, and an empty message aborts the commit.
 
+CommitFileDiffViewer_notContainedInCommit=File {0} is not contained in commit {1}
+
 GitSynchronizeWizard_synchronize=Synchronize
 GitSynchronizeWizard_gitResourceSynchronization=Git Resource Synchronization