From 16e8febd4703353431fc684dd24ee48537c83298 Mon Sep 17 00:00:00 2001
From: Leo Treggiari <leo.treggiari@intel.com>
Date: Thu, 28 Jul 2005 00:13:22 +0000
Subject: [PATCH] Check for null in getOptionById

---
 .../eclipse/cdt/managedbuilder/internal/core/HoldsOptions.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/HoldsOptions.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/HoldsOptions.java
index ad03da45089..d1dccbb1167 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/HoldsOptions.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/HoldsOptions.java
@@ -299,6 +299,7 @@ public class HoldsOptions extends BuildObject implements IHoldsOptions {
 				return superClass.getOptionById(id);
 			}
 		}
+		if (opt == null) return null;
 		return opt.isValid() ? opt : null;
 	}