From fe945d91983c854e2c6e79e225761f48ffd04059 Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Wed, 12 Aug 2009 23:23:07 +0200 Subject: More attempts to fix NullPointerExceptions reported on the forums. http://groups.google.com/group/project-lombok/browse_thread/thread/a8d59daaf7c1ae09 --- src/lombok/javac/apt/Processor.java | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/lombok/javac/apt/Processor.java b/src/lombok/javac/apt/Processor.java index 2d2d06d3..0a5c2424 100644 --- a/src/lombok/javac/apt/Processor.java +++ b/src/lombok/javac/apt/Processor.java @@ -41,6 +41,7 @@ import lombok.javac.JavacAST; import lombok.javac.JavacASTAdapter; import lombok.javac.JavacAST.Node; +import com.sun.source.util.TreePath; import com.sun.source.util.Trees; import com.sun.tools.javac.processing.JavacProcessingEnvironment; import com.sun.tools.javac.tree.JCTree.JCAnnotation; @@ -86,7 +87,10 @@ public class Processor extends AbstractProcessor { IdentityHashMap units = new IdentityHashMap(); - for ( Element element : roundEnv.getRootElements() ) units.put(toUnit(element), null); + for ( Element element : roundEnv.getRootElements() ) { + JCCompilationUnit unit = toUnit(element); + if ( unit != null ) units.put(unit, null); + } List asts = new ArrayList(); @@ -143,6 +147,16 @@ public class Processor extends AbstractProcessor { } private JCCompilationUnit toUnit(Element element) { - return (JCCompilationUnit) trees.getPath(element).getCompilationUnit(); + TreePath path = trees.getPath(element); + if ( path != null ) return (JCCompilationUnit) path.getCompilationUnit(); + else { + if ( element == null ) { + processingEnv.getMessager().printMessage(Kind.WARNING, "LOMBOK DIAGNOSTIC: no TreePath returned for element, " + + "probably because element is null!"); + } + processingEnv.getMessager().printMessage(Kind.WARNING, "LOMBOK DIAGNOSTIC: no TreePath returned for element of type: " + + element.getClass() + "with toString: " + element); + return null; + } } } -- cgit