From 2015ebc3d0b6ed8838d65d4011db13806f4b3e6a Mon Sep 17 00:00:00 2001 From: Sergey Prigogin Date: Thu, 16 Apr 2015 19:47:43 -0700 Subject: [PATCH] Protect against NPE. --- .../rename/HeaderFileReferenceAdjuster.java | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 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 a5213234f27..3978d7235a6 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 @@ -220,17 +220,16 @@ public class HeaderFileReferenceAdjuster { } } - private TextEditGroup createEdit(ITranslationUnit tu, IProgressMonitor pm) + private TextEditGroup createEdit(ITranslationUnit tu, IProgressMonitor monitor) throws CoreException, OperationCanceledException { - checkCanceled(pm); + checkCanceled(monitor); - SubMonitor progress = SubMonitor.convert(pm, 2); - try { - IASTTranslationUnit ast = astManager.getAST(index, tu.getFile(), PARSE_MODE, false); - return createEdit(ast, tu, progress.newChild(1)); - } finally { - pm.done(); - } + SubMonitor progress = SubMonitor.convert(monitor, 3); + IASTTranslationUnit ast = astManager.getAST(index, tu.getFile(), PARSE_MODE, false); + progress.setWorkRemaining(1); + if (ast == null) + return null; + return createEdit(ast, tu, progress.newChild(1)); } private TextEditGroup createEdit(IASTTranslationUnit ast, ITranslationUnit tu, IProgressMonitor pm)