From 4aecba2e95afe6322f3f1145555c7e4bf13198d5 Mon Sep 17 00:00:00 2001 From: David Inglis Date: Thu, 29 Apr 2004 19:26:34 +0000 Subject: [PATCH] added null check for macro name and alllow null value --- .../org/eclipse/cdt/internal/core/model/MacroEntry.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/MacroEntry.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/MacroEntry.java index b36a223f0db..52779e5240e 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/MacroEntry.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/MacroEntry.java @@ -22,8 +22,11 @@ public class MacroEntry extends APathEntry implements IMacroEntry { public MacroEntry (IPath path, IPath baseRef, String macroName, String macroValue, IPath[] exclusionPatterns, boolean isExported) { super(IMacroEntry.CDT_MACRO, null, baseRef, path, exclusionPatterns, isExported); + if ( macroName == null) { + throw new IllegalArgumentException("Macro name cannot be null"); //$NON-NLS-1$ + } this.macroName = macroName; - this.macroValue = macroValue; + this.macroValue = macroValue == null ? "" : macroValue; //$NON-NLS-1$ } /**