From 32cdeab66b19424d1c70bbe0bdcf14224e1c4ce7 Mon Sep 17 00:00:00 2001 From: Sergey Prigogin Date: Wed, 7 Jan 2015 12:21:21 -0800 Subject: [PATCH] Bug 455571 - Unable to rename C/C++ project if project has excluded source folder entry --- .../refactoring/rename/HeaderFileReferenceAdjuster.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/HeaderFileReferenceAdjuster.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/HeaderFileReferenceAdjuster.java index 739b8303645..d5f4cef240e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/HeaderFileReferenceAdjuster.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/HeaderFileReferenceAdjuster.java @@ -172,9 +172,11 @@ public class HeaderFileReferenceAdjuster { CoreModel coreModel = CoreModel.getDefault(); for (IFile file : affectedFiles) { ITranslationUnit tu = (ITranslationUnit) coreModel.create(file); - if (workingCopyManager.findSharedWorkingCopy(tu) != null) - continue; // Shared working copies have already been processed. - addFileChange(tu, changes, checker, progress.newChild(1)); + if (tu != null) { + if (workingCopyManager.findSharedWorkingCopy(tu) != null) + continue; // Shared working copies have already been processed. + addFileChange(tu, changes, checker, progress.newChild(1)); + } } if (!changes.isEmpty()) {