From d4aa4850c746f773f81dd5b05f52a94c6395d4fd Mon Sep 17 00:00:00 2001 From: Markus Schorn Date: Tue, 12 Jan 2010 13:03:24 +0000 Subject: [PATCH] Bug 299358: Protect against NPE. --- .../eclipse/cdt/internal/ui/search/LineSearchElement.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/LineSearchElement.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/LineSearchElement.java index 39502a05df3..eb12ac77011 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/LineSearchElement.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/LineSearchElement.java @@ -146,9 +146,11 @@ public class LineSearchElement extends PDOMSearchElement { // read the content of file FileContent content = FileContent.create(fileLocation); - AbstractCharArray buf = ((InternalFileContent) content).getSource(); - if (buf != null) - result = collectLineElements(buf, matches, fileLocation); + if (content != null) { + AbstractCharArray buf = ((InternalFileContent) content).getSource(); + if (buf != null) + result = collectLineElements(buf, matches, fileLocation); + } return result; }