From 8549e454491ed6f37689ead035dd356f3b639e4c Mon Sep 17 00:00:00 2001 From: Andrey Loskutov Date: Fri, 3 Feb 2017 09:43:35 +0100 Subject: [PATCH] Avoid NPE on conflict during gerrit checkout Bug: 511610 Change-Id: Ie1b9de2aed2fbaa255b97a76565c0da417c492e0 Signed-off-by: Andrey Loskutov --- .../org/eclipse/egit/ui/internal/fetch/FetchGerritChangePage.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchGerritChangePage.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchGerritChangePage.java index 75fe7ae52..d371f357e 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchGerritChangePage.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchGerritChangePage.java @@ -97,7 +97,6 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; import org.eclipse.ui.IWorkbenchCommandConstants; import org.eclipse.ui.PlatformUI; @@ -817,12 +816,11 @@ public class FetchGerritChangePage extends WizardPage { final CheckoutResult result = co.getResult(); if (result.getStatus() == Status.CONFLICTS) { - final Shell shell = getWizard().getContainer().getShell(); - - shell.getDisplay().asyncExec(new Runnable() { + PlatformUI.getWorkbench().getDisplay() + .asyncExec(new Runnable() { @Override public void run() { - new CheckoutConflictDialog(shell, repository, + new CheckoutConflictDialog(null, repository, result.getConflictList()).open(); } }); -- 2.11.4.GIT