diff options
| author | Oleg Krasilnikov | 2007-02-28 10:16:43 +0000 |
|---|---|---|
| committer | Oleg Krasilnikov | 2007-02-28 10:16:43 +0000 |
| commit | ad84cc5f824b981f0f336340cb813caac4ca68dc (patch) | |
| tree | cf255ce47c7beda308c5f73ff4030a663e1f3c2a | |
| parent | 871c565145b5d9efd5eeca9ccd13620ac6eedc86 (diff) | |
| download | org.eclipse.cdt-ad84cc5f824b981f0f336340cb813caac4ca68dc.tar.gz org.eclipse.cdt-ad84cc5f824b981f0f336340cb813caac4ca68dc.tar.xz org.eclipse.cdt-ad84cc5f824b981f0f336340cb813caac4ca68dc.zip | |
Bug #175722: NPE in ToolSettingsPrefStore
| -rw-r--r-- | build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/newui/ToolSettingsPrefStore.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/newui/ToolSettingsPrefStore.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/newui/ToolSettingsPrefStore.java index 5b6efbf699c..9feb03a44d8 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/newui/ToolSettingsPrefStore.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/newui/ToolSettingsPrefStore.java @@ -209,7 +209,8 @@ public class ToolSettingsPrefStore implements IPreferenceStore { IOption option = (IOption)options[i][1]; - if(option.getName().equals(name) //TODO: name vs ID ! + String optionName = option.getName(); + if( ((optionName != null) && optionName.equals(name)) //TODO: name vs ID ! || ((!option.isExtensionElement() || ((Option)option).isAdjustedExtension() || ((Option)option).wasOptRef()) && option.getSuperClass() != null && option.getSuperClass().getId().equals(name))) |