aboutsummaryrefslogtreecommitdiff
path: root/src/core/lombok/javac/JavacResolution.java
diff options
context:
space:
mode:
authorReinier Zwitserloot <reinier@zwitserloot.com>2010-11-10 22:20:08 +0100
committerReinier Zwitserloot <reinier@zwitserloot.com>2010-11-10 22:20:08 +0100
commit40b76b50462ac2a3d25b29eb4a8d28298a474efa (patch)
tree5e9090e40a8d020d48c27dea84f093af5a9ed7bc /src/core/lombok/javac/JavacResolution.java
parentc8774389e7cb73e494267af3a87f70c7497b220a (diff)
parent632027249b813bfabd457c07ebc89c4456e8175d (diff)
downloadlombok-40b76b50462ac2a3d25b29eb4a8d28298a474efa.tar.gz
lombok-40b76b50462ac2a3d25b29eb4a8d28298a474efa.tar.bz2
lombok-40b76b50462ac2a3d25b29eb4a8d28298a474efa.zip
Merge branch 'fixDelombok'
Diffstat (limited to 'src/core/lombok/javac/JavacResolution.java')
-rw-r--r--src/core/lombok/javac/JavacResolution.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/core/lombok/javac/JavacResolution.java b/src/core/lombok/javac/JavacResolution.java
index e0eb436d..2845328d 100644
--- a/src/core/lombok/javac/JavacResolution.java
+++ b/src/core/lombok/javac/JavacResolution.java
@@ -325,6 +325,8 @@ public class JavacResolution {
// NB: There's such a thing as maker.Type(type), but this doesn't work very well; it screws up anonymous classes, captures, and adds an extra prefix dot for some reason too.
// -- so we write our own take on that here.
+ if (type.tag == TypeTags.BOT) return createJavaLangObject(maker, ast);
+
if (type.isPrimitive()) return primitiveToJCTree(type.getKind(), maker);
if (type.isErroneous()) throw new TypeNotConvertibleException("Type cannot be resolved");