From 4f4bfbfca81f321115bafeecbf4dbc414d922f4a Mon Sep 17 00:00:00 2001 From: Greg Watson Date: Mon, 28 Sep 2015 10:01:27 -0400 Subject: [PATCH] Bug 478549 - Add null pointer check Change-Id: Ic7bf5e217d8def75054a86c0bccde5a3669f5d32 Signed-off-by: Greg Watson --- .../ConnectionsPreferencePage.java | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/preferences/ConnectionsPreferencePage.java b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/preferences/ConnectionsPreferencePage.java index 0d1a752820d..8cb7e0d10f3 100644 --- a/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/preferences/ConnectionsPreferencePage.java +++ b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/preferences/ConnectionsPreferencePage.java @@ -243,17 +243,19 @@ public class ConnectionsPreferencePage extends PreferencePage implements IWorkbe } performOk(); } - IRemoteUIConnectionWizard wizard = fUIConnectionManager.getConnectionWizard(getShell()); - if (wizard != null) { - wizard.setConnectionName(initialConnectionName()); - wizard.setInvalidConnectionNames(invalidConnectionNames()); - IRemoteConnectionWorkingCopy conn = wizard.open(); - if (conn != null) { - fWorkingCopies.put(conn.getName(), conn); - if (!fConnectionViewer.getTable().isDisposed()) { - fConnectionViewer.refresh(); + if (fUIConnectionManager != null) { + IRemoteUIConnectionWizard wizard = fUIConnectionManager.getConnectionWizard(getShell()); + if (wizard != null) { + wizard.setConnectionName(initialConnectionName()); + wizard.setInvalidConnectionNames(invalidConnectionNames()); + IRemoteConnectionWorkingCopy conn = wizard.open(); + if (conn != null) { + fWorkingCopies.put(conn.getName(), conn); + if (!fConnectionViewer.getTable().isDisposed()) { + fConnectionViewer.refresh(); + } + fIsDirty = true; } - fIsDirty = true; } } }