Merge pull request #158 from ernesto-castelan/fix-proxy-classes

Add public modifier to proxy related classes to fix IllegalAccessError
grails · Nov 28, 2023 · 1686245 · 1686245
2 parents 509a2d2 + db4bf5a
commit 1686245
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/...e5/src/main/groovy/org/grails/orm/hibernate/proxy/HibernateGroovyObjectMethodHandler.java b/...e5/src/main/groovy/org/grails/orm/hibernate/proxy/HibernateGroovyObjectMethodHandler.java
@@ -9,12 +9,12 @@
  * @author Graeme Rocher
  * @since 6.1.2
  */
-class HibernateGroovyObjectMethodHandler extends EntityProxyMethodHandler {
+public class HibernateGroovyObjectMethodHandler extends EntityProxyMethodHandler {
     private Object target;
     private final Object originalSelf;
     private final LazyInitializer lazyInitializer;
 
-    HibernateGroovyObjectMethodHandler(Class<?> proxyClass, Object originalSelf, LazyInitializer lazyInitializer) {
+    public HibernateGroovyObjectMethodHandler(Class<?> proxyClass, Object originalSelf, LazyInitializer lazyInitializer) {
         super(proxyClass);
         this.originalSelf = originalSelf;
         this.lazyInitializer = lazyInitializer;

diff --git a/...gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/proxy/ProxyFactorySupport.groovy b/...gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/proxy/ProxyFactorySupport.groovy
@@ -35,6 +35,7 @@ class ProxyFactorySupport {
             // first make the lazy initializer
             String initializerName = "${ProxyFactorySupport.package.name}.GroovyAwareJavassistLazyInitializer"
             CtClass initializerSuperClass = getClassFromPool(pool, BasicLazyInitializer.name)
+            pool.getOrNull(initializerName)?.defrost()
             CtClass initializerClass = pool.makeClass(initializerName, initializerSuperClass)
             initializerClass.addInterface(getClassFromPool(pool, MethodHandler.name))
 
@@ -151,6 +152,7 @@ class ProxyFactorySupport {
             // now make the proxy factory
             String factoryName = "${ProxyFactorySupport.package.name}.GroovyAwareJavassistProxyFactory"
             CtClass factorySuperClass = getClassFromPool(pool, AbstractGroovyAwareJavassistProxyFactory.name)
+            pool.getOrNull(factoryName)?.defrost()
             CtClass factorCls = pool.makeClass(factoryName, factorySuperClass)
 
             CtMethod getProxyMethod = factorySuperClass.getMethods().find { CtMethod m -> m.name == 'getProxy' }