Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam Riley2022-05-31 14:34:09 +0000
committerWilliam Riley2022-05-31 14:34:50 +0000
commitc678c76a402356049d41a0c1f2cca530c2f548aa (patch)
tree45cf2638d18728dbcbc488bc2a0a596b3a6d32cb
parent450dbf0d57d7b65ae217918291d2cac884e6175e (diff)
downloadorg.eclipse.cdt-c678c76a402356049d41a0c1f2cca530c2f548aa.tar.gz
org.eclipse.cdt-c678c76a402356049d41a0c1f2cca530c2f548aa.tar.xz
org.eclipse.cdt-c678c76a402356049d41a0c1f2cca530c2f548aa.zip
Bug 580009 - Avoid rare NPE due to folder info not being loaded
Guard against NPE. Full cause needs to be investigated but with this check the behaviour is no worse than before in these cases Change-Id: I27ed2cd915e21fca2ef07335820d9e2496c1c51d
-rw-r--r--build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Option.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Option.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Option.java
index dec68cf9b44..393df9fe958 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Option.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Option.java
@@ -527,7 +527,8 @@ public class Option extends BuildObject implements IOption, IBuildPropertiesRest
if (parent instanceof IToolChain) {
IConfiguration config = ((IToolChain) parent).getParent();
IOption foundOption = null;
- if (config != null) {
+ //In rare cases the RootFolderInfo may not have loaded & will cause an NPE
+ if (config != null && config.getRootFolderInfo() != null) {
IToolChain parentToolchain = config.getToolChain();
if (parentToolchain != null) {
foundOption = parentToolchain.getOptionById(superClassId);

Back to the top