aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReinier Zwitserloot <reinier@zwitserloot.com>2017-11-28 23:43:19 +0100
committerReinier Zwitserloot <reinier@zwitserloot.com>2017-11-29 04:06:23 +0100
commit9be8cd4afdc2f12e6b6b26776f3ea6ccf79621c1 (patch)
tree769a47aa71d6b943f8c828139ca2e95a36e3f064
parent2d5ae0d920d1f602e15d9430f3650c946ad2cdfe (diff)
downloadlombok-9be8cd4afdc2f12e6b6b26776f3ea6ccf79621c1.tar.gz
lombok-9be8cd4afdc2f12e6b6b26776f3ea6ccf79621c1.tar.bz2
lombok-9be8cd4afdc2f12e6b6b26776f3ea6ccf79621c1.zip
bugfix for delomboking source that does not compile; it should just emit compiler errors, not stack traces.
-rw-r--r--src/core/lombok/javac/JavacResolution.java1
-rw-r--r--src/utils/lombok/javac/JavacTreeMaker.java1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/core/lombok/javac/JavacResolution.java b/src/core/lombok/javac/JavacResolution.java
index 67dbaac6..0b6e1341 100644
--- a/src/core/lombok/javac/JavacResolution.java
+++ b/src/core/lombok/javac/JavacResolution.java
@@ -261,6 +261,7 @@ public class JavacResolution {
}
public static Type ifTypeIsIterableToComponent(Type type, JavacAST ast) {
+ if (type == null) return null;
Types types = Types.instance(ast.getContext());
Symtab syms = Symtab.instance(ast.getContext());
Type boundType = ReflectiveAccess.Types_upperBound(types, type);
diff --git a/src/utils/lombok/javac/JavacTreeMaker.java b/src/utils/lombok/javac/JavacTreeMaker.java
index 12baf5af..5f4fb09c 100644
--- a/src/utils/lombok/javac/JavacTreeMaker.java
+++ b/src/utils/lombok/javac/JavacTreeMaker.java
@@ -226,6 +226,7 @@ public class JavacTreeMaker {
}
public static TypeTag typeTag(Type t) {
+ if (t == null) return Javac.CTC_VOID;
try {
return new TypeTag(getFieldCached(FIELD_CACHE, t, "tag"));
} catch (NoSuchFieldException e) {