diff options
author | Reinier Zwitserloot <reinier@zwitserloot.com> | 2020-12-27 05:36:51 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-27 05:36:51 +0100 |
commit | 11b6f8f97a6fde9a5f6e39f38e63cdff73742822 (patch) | |
tree | 733b5a65b754f325fa9273d11fb840a7e0002398 /src/core/lombok/javac/handlers/JavacHandlerUtil.java | |
parent | 0532285eb8de98e9e4e3fc4131476b5f4ef2740d (diff) | |
parent | 624c8a5a52d14ba1a6b690809f9ada15f71e15f5 (diff) | |
download | lombok-11b6f8f97a6fde9a5f6e39f38e63cdff73742822.tar.gz lombok-11b6f8f97a6fde9a5f6e39f38e63cdff73742822.tar.bz2 lombok-11b6f8f97a6fde9a5f6e39f38e63cdff73742822.zip |
Merge pull request #2684 from Rawi01/npe-javadoc
Fix NullPointerException during Javadoc copy
Diffstat (limited to 'src/core/lombok/javac/handlers/JavacHandlerUtil.java')
-rw-r--r-- | src/core/lombok/javac/handlers/JavacHandlerUtil.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/lombok/javac/handlers/JavacHandlerUtil.java b/src/core/lombok/javac/handlers/JavacHandlerUtil.java index df1eb438..fbde9568 100644 --- a/src/core/lombok/javac/handlers/JavacHandlerUtil.java +++ b/src/core/lombok/javac/handlers/JavacHandlerUtil.java @@ -2120,10 +2120,10 @@ public class JavacHandlerUtil { try { JCCompilationUnit cu = ((JCCompilationUnit) from.top().get()); String newJavadoc = copyMode.apply(cu, from); - if (newJavadoc != null) { - if (forceAddReturn) newJavadoc = addReturnsThisIfNeeded(newJavadoc); - Javac.setDocComment(cu, to, newJavadoc); + if (forceAddReturn) { + newJavadoc = addReturnsThisIfNeeded(newJavadoc); } + Javac.setDocComment(cu, to, newJavadoc); } catch (Exception ignore) {} } |