From 38fed492bf0fb735e9be154c7f4be27c5b64ed27 Mon Sep 17 00:00:00 2001 From: Sergey Prigogin Date: Thu, 5 Aug 2010 18:10:41 +0000 Subject: [PATCH] Bug 321760. --- .../ui/refactoring/rename/CRenameProcessorDelegate.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameProcessorDelegate.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameProcessorDelegate.java index 10be79d4a19..0a98ec574f7 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameProcessorDelegate.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameProcessorDelegate.java @@ -218,11 +218,12 @@ public abstract class CRenameProcessorDelegate { fMatches= new ArrayList(); TextSearchWrapper txtSearch= getManager().getTextSearch(); Collection fileFilter = getFileFilter(); - if (!fileFilter.contains(file)) { + if (fileFilter != null && !fileFilter.contains(file)) { fileFilter.add(file); } IStatus stat= txtSearch.searchWord(getSearchScope(), file, getSelectedWorkingSet(), - fileFilter.toArray(new IResource[fileFilter.size()]), getManager().getCCppPatterns(), + fileFilter != null ? fileFilter.toArray(new IResource[fileFilter.size()]) : null, + getManager().getCCppPatterns(), getArgument().getName(), new SubProgressMonitor(monitor, 1), fMatches); if (monitor.isCanceled()) { throw new OperationCanceledException();