From dace53ca5e915636d7791876354b3cc2c1bced73 Mon Sep 17 00:00:00 2001 From: Dave McKnight Date: Thu, 13 Feb 2014 13:21:33 -0500 Subject: [PATCH] [428126] NPE in remote import wizard --- .../importexport/files/RemoteImportWizardPage1.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/rse/plugins/org.eclipse.rse.importexport/src/org/eclipse/rse/internal/importexport/files/RemoteImportWizardPage1.java b/rse/plugins/org.eclipse.rse.importexport/src/org/eclipse/rse/internal/importexport/files/RemoteImportWizardPage1.java index 0d0216aa39b..46a12f7ee08 100644 --- a/rse/plugins/org.eclipse.rse.importexport/src/org/eclipse/rse/internal/importexport/files/RemoteImportWizardPage1.java +++ b/rse/plugins/org.eclipse.rse.importexport/src/org/eclipse/rse/internal/importexport/files/RemoteImportWizardPage1.java @@ -21,6 +21,7 @@ * David McKnight (IBM) - [368465] Import Files -RSE - Cyclic Symbolic Reference problem * David McKnight (IBM) - [417033] [import/export] RSE import wizard won't let user to select new source * David McKnight (IBM) - [422844] rse.files.ui fails to compile against Eclipse 4.4 Luna I20131126 + * David McKnight (IBM) - [428126] NPE in remote import wizard *******************************************************************************/ package org.eclipse.rse.internal.importexport.files; @@ -167,12 +168,13 @@ class RemoteImportWizardPage1 extends WizardResourceImportPage implements Listen public IStatus run(IProgressMonitor monitor){ _isActive = true; - if (_control == null){ - _control = _page.getControl(); - } - final Display d = _control.getDisplay(); + + final Display d = getShell().getDisplay(); d.syncExec(new Runnable(){ public void run(){ + if (_control == null){ + _control = getControl(); + } if (!_control.isDisposed()){ Cursor bC = new Cursor(d, SWT.CURSOR_WAIT); _control.setCursor(bC);