Bug 538221 - NullPointerException in LinuxtoolsPathPropertyPage

- verify that class variables are initialized before referring to them
  in performOk(), performDefaults(), and performApply()

Change-Id: If5d5b2d9ab85c3ff1b8b17d39fcc94ad4772ddc9
Reviewed-on: https://git.eclipse.org/r/127962
Tested-by: CI Bot
Reviewed-by: Jeff Johnston <jjohnstn@redhat.com>

1 files changed, 19 insertions, 11 deletions

diff --git a/profiling/org.eclipse.linuxtools.tools.launch.ui/src/org/eclipse/linuxtools/internal/tools/launch/ui/properties/LinuxtoolsPathPropertyPage.java b/profiling/org.eclipse.linuxtools.tools.launch.ui/src/org/eclipse/linuxtools/internal/tools/launch/ui/properties/LinuxtoolsPathPropertyPage.java
index d402d7bf28..024d6369eb 100644
--- a/profiling/org.eclipse.linuxtools.tools.launch.ui/src/org/eclipse/linuxtools/internal/tools/launch/ui/properties/LinuxtoolsPathPropertyPage.java
+++ b/profiling/org.eclipse.linuxtools.tools.launch.ui/src/org/eclipse/linuxtools/internal/tools/launch/ui/properties/LinuxtoolsPathPropertyPage.java
@@ -67,6 +67,7 @@ public class LinuxtoolsPathPropertyPage extends PropertyPage {
     private Composite result;
     private Button systemEnvButton, customButton;
     private boolean customSelected;
+    private boolean initialized = false;
 
     private String [][]fillPaths() {
         LinkedList<String[]> list = new LinkedList<>();
@@ -157,6 +158,7 @@ public class LinuxtoolsPathPropertyPage extends PropertyPage {
         linuxtoolsPathCombo.setSelectedValue(linuxtoolsPath.getStringValue());
         Dialog.applyDialogFont(result);
         updateOptionsEnable();
+        initialized = true;
         return result;
     }
 
@@ -172,26 +174,32 @@ public class LinuxtoolsPathPropertyPage extends PropertyPage {
 
     @Override
     protected void performDefaults() {
-        linuxtoolsPath.loadDefault();
-        linuxtoolsPathCombo.loadDefault();
-        customButton.setSelection(!LinuxtoolsPathProperty.getInstance().getLinuxtoolsPathSystemDefault());
-        systemEnvButton.setSelection(LinuxtoolsPathProperty.getInstance().getLinuxtoolsPathSystemDefault());
-        updateOptionsEnable();
+    	if (initialized) {
+    		linuxtoolsPath.loadDefault();
+    		linuxtoolsPathCombo.loadDefault();
+    		customButton.setSelection(!LinuxtoolsPathProperty.getInstance().getLinuxtoolsPathSystemDefault());
+    		systemEnvButton.setSelection(LinuxtoolsPathProperty.getInstance().getLinuxtoolsPathSystemDefault());
+    		updateOptionsEnable();
+    	}
     }
 
     @Override
     public boolean performOk() {
-        linuxtoolsPath.store();
-        linuxtoolsPathCombo.store();
-        getPreferenceStore().setValue(LaunchCoreConstants.LINUXTOOLS_PATH_SYSTEM_NAME, systemEnvButton.getSelection());
+    	if (initialized) {
+    		linuxtoolsPath.store();
+    		linuxtoolsPathCombo.store();
+    		getPreferenceStore().setValue(LaunchCoreConstants.LINUXTOOLS_PATH_SYSTEM_NAME, systemEnvButton.getSelection());
+    	}
         return super.performOk();
     }
 
     @Override
     protected void performApply() {
-        linuxtoolsPath.store();
-        linuxtoolsPathCombo.store();
-        getPreferenceStore().setValue(LaunchCoreConstants.LINUXTOOLS_PATH_SYSTEM_NAME, systemEnvButton.getSelection());
+    	if (initialized) {
+    		linuxtoolsPath.store();
+    		linuxtoolsPathCombo.store();
+    		getPreferenceStore().setValue(LaunchCoreConstants.LINUXTOOLS_PATH_SYSTEM_NAME, systemEnvButton.getSelection());
+    	}
         super.performApply();
     }