Bug 365916

Description Remy Suen 2011-12-07 10:44:53 EST

I was reverting four commits. The first three went okay but it seems like the fourth one got a conflict. An error dialog appeared informing me about an NPE.

Caused by: java.lang.NullPointerException
	at org.eclipse.egit.ui.internal.dialogs.RevertFailureDialog.createCustomArea(RevertFailureDialog.java:163)
	at org.eclipse.jface.dialogs.MessageDialog.createDialogArea(MessageDialog.java:273)
	at org.eclipse.jface.dialogs.IconAndMessageDialog.createDialogAndButtonArea(IconAndMessageDialog.java:221)
	at org.eclipse.jface.dialogs.IconAndMessageDialog.createContents(IconAndMessageDialog.java:200)
	at org.eclipse.jface.window.Window.create(Window.java:431)
	at org.eclipse.jface.dialogs.Dialog.create(Dialog.java:1089)
	at org.eclipse.jface.window.Window.open(Window.java:790)
	at org.eclipse.jface.dialogs.MessageDialog.open(MessageDialog.java:334)
	at org.eclipse.egit.ui.internal.dialogs.RevertFailureDialog.show(RevertFailureDialog.java:65)
	at org.eclipse.egit.ui.internal.history.command.RevertHandler$2.run(RevertHandler.java:90)
	at org.eclipse.ui.internal.UILockListener.doPendingWork(UILockListener.java:164)
	at org.eclipse.ui.internal.UISynchronizer$3.run(UISynchronizer.java:158)
	at org.eclipse.swt.widgets.RunnableLock.run(RunnableLock.java:35)
	at org.eclipse.swt.widgets.Synchronizer.runAsyncMessages(Synchronizer.java:135)
	... 24 more