commit 9a4e02f6f30e79536f8aa2fab66bfff9ae90013d
author Lukas Jungmann <lukas.jungmann@oracle.com> Fri Aug 27 11:19:04 2021 +0200
committer Lukas Jungmann <lukas.jungmann@oracle.com> Fri Aug 27 11:32:28 2021 +0200
tree 4f55088d2f72e9de1ef2f54c2e9440c95004f084
parent 97ab8c2e3966ee08e7063bf20e488f0b4c5a4daf

improve original fix for #1556 to not break existing consumers

Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>

jaxb-ri/codemodel/codemodel/src/main/java/com/sun/codemodel/JAnnotationClassValue.java

diff --git a/jaxb-ri/codemodel/codemodel/src/main/java/com/sun/codemodel/JAnnotationClassValue.java b/jaxb-ri/codemodel/codemodel/src/main/java/com/sun/codemodel/JAnnotationClassValue.java
index 2140b41..1807b37 100644
--- a/jaxb-ri/codemodel/codemodel/src/main/java/com/sun/codemodel/JAnnotationClassValue.java
+++ b/jaxb-ri/codemodel/codemodel/src/main/java/com/sun/codemodel/JAnnotationClassValue.java
@@ -19,7 +19,7 @@
     private String param;
 
     JAnnotationClassValue(JClass type) {
-        this.type = type.erasure();
+        this.type = type;
     }
 
     JAnnotationClassValue(JEnumConstant en) {
@@ -31,9 +31,9 @@
     @Override
     public void generate(JFormatter f) {
         if (param != null) {
-            f.t(type).p('.').p(param);
+            f.t(type.erasure()).p('.').p(param);
         } else {
-            f.t(type).p(".class");
+            f.t(type.erasure()).p(".class");
         }
     }