Merge branch '2.3.x' of github.com:grails/grails-core into 2.3.x

Author: graemerocher

grails-core/src/main/groovy/org/codehaus/groovy/grails/commons/spring/ReloadAwareAutowireCapableBeanFactory.java

@@ -183,7 +183,19 @@ public void autowireBeanProperties(Object existingBean, int autowireMode, boolea
             if (DISABLE_AUTOWIRE_BY_NAME_OPTIMIZATIONS || dependencyCheck || existingBean instanceof Aware) {
                 super.autowireBeanProperties(existingBean, autowireMode, dependencyCheck);
             } else {
-                populateBeanInAutowireByName(existingBean);
+                try {
+                    populateBeanInAutowireByName(existingBean);
+                } catch (Exception e) {
+                    logger.error("Bean couldn't be autowired using grails optimization: " + e.getMessage());
+                    logger.error("Retrying using spring autowire");
+
+                    // Remove the cache value in order to asure there is no problem with a previous value
+                    Class<?> beanClass = ClassUtils.getUserClass(existingBean.getClass());
+                    autowireableBeanPropsCacheForClass.remove(beanClass);
+
+                    // Calls the spring method
+                    super.autowireBeanProperties(existingBean, autowireMode, dependencyCheck);
+                }
             }
         } else {
             super.autowireBeanProperties(existingBean, autowireMode, dependencyCheck);
@@ -269,7 +281,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;
             }

grails-test-suite-uber/src/test/groovy/org/codehaus/groovy/grails/commons/spring/ReloadAwareAutowireCapableBeanFactorySpec.groovy

@@ -0,0 +1,49 @@
+package org.codehaus.groovy.grails.commons.spring
+
+import spock.lang.Specification
+
+import org.springframework.util.ClassUtils
+import javassist.util.proxy.*
+import org.springframework.beans.*
+import java.beans.PropertyDescriptor
+import org.springframework.beans.factory.support.GenericBeanDefinition
+
+class ReloadAwareAutowireCapableBeanFactorySpec extends Specification {
+    static int AUTOWIRE_BY_NAME = 1
+
+    void "Test factory bean cache fallback"() {
+        setup: "Setup the factory bean"
+            def factoryBean = new ReloadAwareAutowireCapableBeanFactory()
+
+        and: "Bean to be inspected for autowire"
+            def existingBean = new TestObject()
+
+        and: "Creates a Javassist proxy"
+            def proxyFactory = new ProxyFactory()
+            proxyFactory.setSuperclass(TestObject.class)
+            def clazz = proxyFactory.createClass()
+            def proxy = clazz.newInstance([:])
+
+        and: "Saves the property 'setAutowireProperty' and 'getAutowireProperty' inside the properties cache"
+            def writeMethod = clazz.getMethod("setAutowireProperty", Object.class)
+            def readMethod = clazz.getMethod("getAutowireProperty")
+            def autowireableBeanProps = ['autowireProperty': new PropertyDescriptor('autowireProperty', readMethod, writeMethod)]
+
+        and: "Put the proxy inside the properties cache"
+            def beanDefinition = new GenericBeanDefinition()
+            beanDefinition.beanClass = String.class
+            beanDefinition.autowireCandidate = true
+            factoryBean.registerBeanDefinition("autowireProperty", beanDefinition)
+            factoryBean.autowireableBeanPropsCacheForClass.put(TestObject.class, autowireableBeanProps)
+
+        when: "We try to autowire a normal bean but the cache is populated with the proxy"
+            factoryBean.autowireBeanProperties(existingBean, 1, false)
+
+        then:
+            notThrown(Exception)
+    }
+}
+
+class TestObject{
+    def autowireProperty
+}