Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 365916 - NPE in RevertFailureDialog
Summary: NPE in RevertFailureDialog
Status: RESOLVED FIXED
Alias: None
Product: EGit
Classification: Technology
Component: UI (show other bugs)
Version: 1.2   Edit
Hardware: PC Windows 7
: P3 normal (vote)
Target Milestone: 1.2   Edit
Assignee: Kevin Sawicki CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-12-07 10:44 EST by Remy Suen CLA
Modified: 2011-12-15 17:37 EST (History)
1 user (show)

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Remy Suen CLA 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
Comment 1 Kevin Sawicki CLA 2011-12-07 18:14:11 EST 
Proposed fix pushed to: http://egit.eclipse.org/r/#change,4763
Comment 2 Matthias Sohn CLA 2011-12-15 17:37:18 EST 
merged as 46ec0ec6ef8d77a1c5ae5344ffa17536227dfd5b