diff options
| author | Adam Juraszek <Adam.Juraszek@ataccama.com> | 2019-05-22 18:36:42 +0200 |
|---|---|---|
| committer | Adam Juraszek <Adam.Juraszek@ataccama.com> | 2019-05-22 18:36:42 +0200 |
| commit | 06004b933b6afaa58ca753c4c33e8a977f91e294 (patch) | |
| tree | 3b6ec0d02aa3f632b92d5eef1d428f14fc15aa82 /src/core/lombok/javac | |
| parent | 7fe489686716e72983d2c3586c7e2e1e07200ba7 (diff) | |
| download | lombok-06004b933b6afaa58ca753c4c33e8a977f91e294.tar.gz lombok-06004b933b6afaa58ca753c4c33e8a977f91e294.tar.bz2 lombok-06004b933b6afaa58ca753c4c33e8a977f91e294.zip | |
Fixes for CustomLog, AUTHORS entry, extended changlog
Diffstat (limited to 'src/core/lombok/javac')
| -rw-r--r-- | src/core/lombok/javac/handlers/JavacHandlerUtil.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/lombok/javac/handlers/JavacHandlerUtil.java b/src/core/lombok/javac/handlers/JavacHandlerUtil.java index ee012d2b..6fa70ff3 100644 --- a/src/core/lombok/javac/handlers/JavacHandlerUtil.java +++ b/src/core/lombok/javac/handlers/JavacHandlerUtil.java @@ -1450,7 +1450,7 @@ public class JavacHandlerUtil { java.util.List<TypeName> configuredCopyable = node.getAst().readConfiguration(ConfigurationKeys.COPYABLE_ANNOTATIONS); if (!annoName.isEmpty()) { - for (TypeName cn : configuredCopyable) if (typeMatches(cn.toString(), node, anno.annotationType)) return List.of(anno); + for (TypeName cn : configuredCopyable) if (cn != null && typeMatches(cn.toString(), node, anno.annotationType)) return List.of(anno); for (String bn : BASE_COPYABLE_ANNOTATIONS) if (typeMatches(bn, node, anno.annotationType)) return List.of(anno); } @@ -1459,7 +1459,7 @@ public class JavacHandlerUtil { if (child.getKind() == Kind.ANNOTATION) { JCAnnotation annotation = (JCAnnotation) child.get(); boolean match = false; - for (TypeName cn : configuredCopyable) if (typeMatches(cn.toString(), node, annotation.annotationType)) { + for (TypeName cn : configuredCopyable) if (cn != null && typeMatches(cn.toString(), node, annotation.annotationType)) { result.append(annotation); match = true; break; |