From 8a05fb1f3a74c4bdbe2981ae149ce0fb35786ab8 Mon Sep 17 00:00:00 2001 From: Alain Magloire Date: Wed, 1 Oct 2003 14:18:13 +0000 Subject: [PATCH] Fix NPE --- .../org/eclipse/cdt/internal/core/model/BinaryElement.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BinaryElement.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BinaryElement.java index 3c4b6bd21d4..812052876e0 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BinaryElement.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BinaryElement.java @@ -113,6 +113,7 @@ public class BinaryElement extends CElement implements IBinaryElement, ISourceMa } } } else { + // TODO-model: handle non-absolute paths when finding source files // ??? assert() path = new Path(""); } @@ -121,7 +122,10 @@ public class BinaryElement extends CElement implements IBinaryElement, ISourceMa ICProject cproject = getCProject(); SourceMapper mapper = mgr.getSourceMapper(cproject); if (mapper != null) { - tu = mapper.findTranslationUnit(path.lastSegment()); + String lastSegment = path.lastSegment(); + if (lastSegment != null) { + tu = mapper.findTranslationUnit(lastSegment); + } } } }