Merge pull request #3326 from Rawi01/utilityclass-npe

Reset erasure_field of symbol

2 files changed, 6 insertions, 2 deletions

diff --git a/src/core/lombok/javac/handlers/HandleUtilityClass.java b/src/core/lombok/javac/handlers/HandleUtilityClass.java
index 716d6d63..b20aee3a 100644
--- a/src/core/lombok/javac/handlers/HandleUtilityClass.java
+++ b/src/core/lombok/javac/handlers/HandleUtilityClass.java
@@ -128,8 +128,11 @@ public class HandleUtilityClass extends JavacAnnotationHandler<UtilityClass> {
 				JCClassDecl innerClassDecl = (JCClassDecl) element.get();
 				innerClassDecl.mods.flags |= Flags.STATIC;
 				ClassSymbol innerClassSymbol = innerClassDecl.sym;
-				if (innerClassSymbol != null && innerClassSymbol.type instanceof ClassType) {
-					((ClassType) innerClassSymbol.type).setEnclosingType(Type.noType);
+				if (innerClassSymbol != null) {
+					if (innerClassSymbol.type instanceof ClassType) {
+						((ClassType) innerClassSymbol.type).setEnclosingType(Type.noType);
+					}
+					innerClassSymbol.erasure_field = null;
 				}
 			}
 		}
diff --git a/src/stubs/com/sun/tools/javac/code/Symbol.java b/src/stubs/com/sun/tools/javac/code/Symbol.java
index f389f1a8..3a41edf9 100644
--- a/src/stubs/com/sun/tools/javac/code/Symbol.java
+++ b/src/stubs/com/sun/tools/javac/code/Symbol.java
@@ -25,6 +25,7 @@ public abstract class Symbol implements Element {
 	public Type type;
 	public Name name;
 	public Symbol owner;
+	public Type erasure_field;
 
 	public long flags() { return 0; }
 	public boolean isStatic() { return false; }