| commit | 4be6cbe06b92f7da0e369345feceeeed393efa7b | [log] [tgz] |
|---|---|---|
| author | Emanuel Graf <egraf@hsr.ch> | Thu Sep 11 19:20:12 2008 +0000 |
| committer | Emanuel Graf <egraf@hsr.ch> | Thu Sep 11 19:20:12 2008 +0000 |
| tree | 426efb2419f7112c3b31b52f2f9ad037c5369584 | |
| parent | d27604d2e2287d7d8255d7f3017dec1eba8532a8 [diff] |
FIXED - bug 246921: NPE in ChangeGenerator when extracting constant https://bugs.eclipse.org/bugs/show_bug.cgi?id=246921 patch from Tom Ball
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/changegenerator/ChangeGenerator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/changegenerator/ChangeGenerator.java index f6097db..f692980 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/changegenerator/ChangeGenerator.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/changegenerator/ChangeGenerator.java
@@ -232,8 +232,10 @@ targetLocation = getFileLocationOfEmptyTranslationUnit(modification.getTargetNode()); String currentFile = targetLocation.getFileName(); IPath implPath = new Path(currentFile); - IFile relevantFile = ResourcesPlugin.getWorkspace().getRoot() - .getFileForLocation(implPath); + IFile relevantFile = ResourcesPlugin.getWorkspace().getRoot().getFileForLocation(implPath); + if (relevantFile == null) { // if not in workspace + throw new UnhandledASTModificationException(modification); + } MultiTextEdit edit; if (changes.containsKey(relevantFile)) { edit = changes.get(relevantFile);