Never use PropertyDescriptors of a proxy class

grails · Apr 23, 2014 · 47cb34b · 47cb34b · lhotari · Apr 23, 2014
1 parent 099fdcb
commit 47cb34b
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/...oovy/org/codehaus/groovy/grails/commons/spring/ReloadAwareAutowireCapableBeanFactory.java b/...oovy/org/codehaus/groovy/grails/commons/spring/ReloadAwareAutowireCapableBeanFactory.java
@@ -269,7 +269,12 @@ protected Map<String, PropertyDescriptor> resolveAutowireablePropertyDescriptors
         return resolveAutowireablePropertyDescriptorsForClass(existingBean.getClass(), new Callable<BeanWrapper>() {
             public BeanWrapper call() throws Exception {
                 BeanWrapperImpl bw = new BeanWrapperImpl(false);
-                bw.setWrappedInstance(existingBean);
+                Class userClass = ClassUtils.getUserClass(existingBean.getClass());
+                if(userClass != existingBean.getClass()) {
+                    bw.setWrappedInstance(BeanUtils.instantiate(userClass));
+                } else {
+                    bw.setWrappedInstance(existingBean);
+                }
                 bw.setConversionService(getConversionService());
                 return bw;
             }