From 12b0753336e25aab11476234553b9058dc592eb2 Mon Sep 17 00:00:00 2001 From: Philipp Eichhorn Date: Mon, 16 May 2011 20:34:17 +0200 Subject: Fixes issue 205: NullPointerException in javac's Check$Validator with val --- src/core/lombok/javac/TreeMirrorMaker.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/core/lombok/javac/TreeMirrorMaker.java b/src/core/lombok/javac/TreeMirrorMaker.java index d3f95b29..7354be97 100644 --- a/src/core/lombok/javac/TreeMirrorMaker.java +++ b/src/core/lombok/javac/TreeMirrorMaker.java @@ -5,7 +5,9 @@ import java.util.IdentityHashMap; import java.util.Iterator; import java.util.Map; +import com.sun.source.tree.VariableTree; import com.sun.tools.javac.tree.JCTree; +import com.sun.tools.javac.tree.JCTree.JCVariableDecl; import com.sun.tools.javac.tree.TreeCopier; import com.sun.tools.javac.util.List; @@ -51,4 +53,12 @@ public class TreeMirrorMaker extends TreeCopier { public Map getOriginalToCopyMap() { return Collections.unmodifiableMap(originalToCopy); } + + // Fix for NPE in HandleVal. See http://code.google.com/p/projectlombok/issues/detail?id=205 + // Maybe this should be done elsewhere... + @Override public JCTree visitVariable(VariableTree node, Void p) { + JCVariableDecl copy = (JCVariableDecl) super.visitVariable(node, p); + copy.sym = ((JCVariableDecl) node).sym; + return copy; + } } -- cgit