From c678c76a402356049d41a0c1f2cca530c2f548aa Mon Sep 17 00:00:00 2001
From: William Riley <william.riley@renesas.com>
Date: Tue, 31 May 2022 15:34:09 +0100
Subject: [PATCH] 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
---
 .../org/eclipse/cdt/managedbuilder/internal/core/Option.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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);