From d4a03b962f3df313e89638d592ff72cbf76fda2a Mon Sep 17 00:00:00 2001 From: Markus Schorn Date: Fri, 5 Oct 2007 12:25:52 +0000 Subject: [PATCH] Fix for 205566, NPE when searching. --- .../eclipse/cdt/internal/ui/search/PDOMSearchResult.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchResult.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchResult.java index b7da9e5fa57..2828243be78 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchResult.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchResult.java @@ -92,9 +92,11 @@ public class PDOMSearchResult extends AbstractTextSearchResult implements IEdito } public boolean isShownInEditor(Match match, IEditorPart editor) { - IPath filename = new Path(getFileName(editor)); - if (filename != null && match instanceof PDOMSearchMatch) - return filename.equals(IndexLocationFactory.getAbsolutePath(((PDOMSearchMatch)match).getLocation())); + final String fileName= getFileName(editor); + if (fileName != null && match instanceof PDOMSearchMatch) { + final IPath filePath= new Path(fileName); + return filePath.equals(IndexLocationFactory.getAbsolutePath(((PDOMSearchMatch)match).getLocation())); + } return false; }